Gainfully employ the new ttyioctl in the trivial cases.

8 files changed, 3 insertions, 151 deletions

diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index e556c0f..c968d28 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -61,13 +61,11 @@ __FBSDID("$FreeBSD$");
 
 static	d_open_t	promopen;
 static	d_close_t	promclose;
-static	d_ioctl_t	promioctl;
 
 static struct cdevsw prom_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_open =	promopen,
 	.d_close =	promclose,
-	.d_ioctl =	promioctl,
 	.d_name =	"prom",
 	.d_flags =	D_TTY | D_NEEDGIANT,
 };
@@ -156,31 +154,6 @@ promclose(dev, flag, mode, td)
 }
  
 int
-promioctl(dev, cmd, data, flag, td)
-	dev_t dev;
-	u_long cmd;
-	caddr_t data;
-	int flag;
-	struct thread *td;
-{
-	int unit = minor(dev);
-	struct tty *tp = prom_tp;
-	int error;
-
-	if (unit != 0)
-		return ENXIO;
-
-	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
-	if (error != ENOIOCTL)
-		return error;
-	error = ttioctl(tp, cmd, data, flag);
-	if (error != ENOIOCTL)
-		return error;
-
-	return ENOTTY;
-}
-
-int
 promparam(tp, t)
 	struct tty *tp;
 	struct termios *t;
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 749dd6d..59d989c 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -68,13 +68,11 @@ struct zs_softc {
 
 static	d_open_t	zsopen;
 static	d_close_t	zsclose;
-static	d_ioctl_t	zsioctl;
 
 static struct cdevsw zs_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_open =	zsopen,
 	.d_close =	zsclose,
-	.d_ioctl =	zsioctl,
 	.d_name =	"zs",
 	.d_flags =	D_TTY | D_NEEDGIANT,
 };
@@ -328,31 +326,6 @@ zsclose(dev_t dev, int flag, int mode, struct thread *td)
 }
  
 static int
-zsioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
-{
-	struct zs_softc *sc = ZS_SOFTC(minor(dev));
-	struct tty *tp;
-	int error;
-	
-	if (sc == NULL)
-		return (ENXIO);
-
-	tp = ZS_SOFTC(minor(dev))->tp;
-
-	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
-
-	if (error != ENOIOCTL)
-		return (error);
-
-	error = ttioctl(tp, cmd, data, flag);
-
-	if (error != ENOIOCTL)
-		return (error);
-	else
-		return (ENOTTY);
-}
-
-static int
 zsparam(struct tty *tp, struct termios *t)
 {
 	return (0);
diff --git a/sys/dev/dcons/dcons.c b/sys/dev/dcons/dcons.c
index cb983e4..1734466 100644
--- a/sys/dev/dcons/dcons.c
+++ b/sys/dev/dcons/dcons.c
@@ -85,14 +85,12 @@ static struct consdev gdbconsdev;
 
 static d_open_t		dcons_open;
 static d_close_t	dcons_close;
-static d_ioctl_t	dcons_ioctl;
 
 static struct cdevsw dcons_cdevsw = {
 #if __FreeBSD_version >= 500104
 	.d_version =	D_VERSION,
 	.d_open =	dcons_open,
 	.d_close =	dcons_close,
-	.d_ioctl =	dcons_ioctl,
 	.d_name =	"dcons",
 	.d_flags =	D_TTY | D_NEEDGIANT,
 #else
@@ -219,29 +217,6 @@ dcons_close(dev_t dev, int flag, int mode, struct THREAD *td)
 }
 
 static int
-dcons_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct THREAD *td)
-{
-	int	unit;
-	struct	tty *tp;
-	int	error;
-
-	unit = minor(dev);
-	if (unit != 0)
-		return (ENXIO);
-
-	tp = dev->si_tty;
-	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
-	if (error != ENOIOCTL)
-		return (error);
-
-	error = ttioctl(tp, cmd, data, flag);
-	if (error != ENOIOCTL)
-		return (error);
-
-	return (ENOTTY);
-}
-
-static int
 dcons_tty_param(struct tty *tp, struct termios *t)
 {
 	tp->t_ispeed = t->c_ispeed;
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 506b894..04ba580 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -49,13 +49,11 @@ __FBSDID("$FreeBSD$");
 
 static d_open_t		ofw_dev_open;
 static d_close_t	ofw_dev_close;
-static d_ioctl_t	ofw_dev_ioctl;
 
 static struct cdevsw ofw_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_open =	ofw_dev_open,
 	.d_close =	ofw_dev_close,
-	.d_ioctl =	ofw_dev_ioctl,
 	.d_name =	"ofw",
 	.d_flags =	D_TTY | D_NEEDGIANT,
 };
@@ -173,32 +171,6 @@ ofw_dev_close(dev_t dev, int flag, int mode, struct thread *td)
 	return (0);
 }
 
-static int
-ofw_dev_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
-{
-	int	unit;
-	struct	tty *tp;
-	int	error;
-
-	unit = minor(dev);
-	tp = ofw_tp;
-
-	if (unit != 0) {
-		return (ENXIO);
-	}
-
-	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
-	if (error != ENOIOCTL) {
-		return (error);
-	}
-
-	error = ttioctl(tp, cmd, data, flag);
-	if (error != ENOIOCTL) {
-		return (error);
-	}
-
-	return (ENOTTY);
-}
 
 static int
 ofw_tty_param(struct tty *tp, struct termios *t)
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 7a81f3f..eb685cf 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -1344,13 +1344,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	break;
     }
 
-    error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
-    if (error != ENOIOCTL)
-	return(error);
-    error = ttioctl(tp, cmd, data, flag);
-    if (error != ENOIOCTL)
-	return(error);
-    return(ENOTTY);
+    return (ttyioctl(dev, cmd, data, flag, td));
 }
 
 static void
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index 7aa72cf..af36098 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -233,13 +233,7 @@ smioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 		return ENODEV;
 	}
 
-	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
-	if (error != ENOIOCTL)
-		return error;
-	error = ttioctl(tp, cmd, data, flag);
-	if (error != ENOIOCTL)
-		return error;
-	return ENOTTY;
+	return(ttyioctl(dev, cmd, data, flag, td));
 }
 
 static void
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 0b4fdc0..dcadcdb 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -397,14 +397,7 @@ pcvt_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	if((error = vgaioctl(dev,cmd,data,flag)) >= 0)
 		return error;
 
-	if((error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td))
-	    != ENOIOCTL)
-		return (error);
-
-	if((error = ttioctl(tp, cmd, data, flag)) != ENOIOCTL)
-		return (error);
-
-	return (ENOTTY);
+	return (ttyioctl(dev, cmd, data, flag, td));
 }
 
 /*---------------------------------------------------------------------------*
diff --git a/sys/ia64/ia64/ssc.c b/sys/ia64/ia64/ssc.c
index 68f4727..d483aeb 100644
--- a/sys/ia64/ia64/ssc.c
+++ b/sys/ia64/ia64/ssc.c
@@ -55,13 +55,11 @@
 
 static	d_open_t	sscopen;
 static	d_close_t	sscclose;
-static	d_ioctl_t	sscioctl;
 
 static struct cdevsw ssc_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_open =	sscopen,
 	.d_close =	sscclose,
-	.d_ioctl =	sscioctl,
 	.d_name =	"ssc",
 	.d_flags =	D_TTY | D_NEEDGIANT,
 };
@@ -193,26 +191,6 @@ sscclose(dev_t dev, int flag, int mode, struct thread *td)
 }
  
 static int
-sscioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
-{
-	int unit = minor(dev);
-	struct tty *tp = ssc_tp;
-	int error;
-
-	if (unit != 0)
-		return ENXIO;
-
-	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
-	if (error != ENOIOCTL)
-		return error;
-	error = ttioctl(tp, cmd, data, flag);
-	if (error != ENOIOCTL)
-		return error;
-
-	return ENOTTY;
-}
-
-static int
 sscparam(struct tty *tp, struct termios *t)
 {