Remove five now unused fields from struct cdevsw. They should never

have been there in the first place.  A GENERIC kernel shrinks almost 1k.

Add a slightly different safetybelt under nostop for tty drivers.

Add some missing FreeBSD tags

8 files changed, 8 insertions, 60 deletions

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index fa0b4df..e8ac386 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -78,19 +78,14 @@ static struct cdevsw fildesc_cdevsw = {
 	/* read */	noread,
 	/* write */	nowrite,
 	/* ioctl */	noioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"FD",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index b08a3f8..a6f03d0 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -69,19 +69,14 @@ static struct cdevsw log_cdevsw = {
 	/* read */	logread,
 	/* write */	nowrite,
 	/* ioctl */	logioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	logpoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"log",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
index e0298f7..6819fb3 100644
--- a/sys/kern/subr_xxx.c
+++ b/sys/kern/subr_xxx.c
@@ -133,31 +133,6 @@ noioctl(dev, cmd, data, flags, p)
 	return (ENODEV);
 }
 
-void
-nostop(tp, rw)
-	struct tty *tp;
-	int rw;
-{
-
-}
-
-int
-noreset(dev)
-	dev_t dev;
-{
-
-	printf("noreset(%d,%d) called\n", major(dev), minor(dev));
-	return (ENODEV);
-}
-
-struct tty *
-nodevtotty(dev)
-	dev_t dev;
-{
-
-	return (NULL);
-}
-
 int
 nommap(dev, offset, nprot)
 	dev_t dev;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 88456be..e014e31 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -2434,3 +2434,11 @@ sysctl_kern_ttys SYSCTL_HANDLER_ARGS
 
 SYSCTL_PROC(_kern, OID_AUTO, ttys, CTLTYPE_OPAQUE|CTLFLAG_RD,
 	0, 0, sysctl_kern_ttys, "S,tty", "All struct ttys");
+
+void
+nottystop(tp, rw)
+	struct tty *tp;
+	int rw;
+{
+	return;
+}
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index c59864f..53c292e 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -66,19 +66,14 @@ static struct cdevsw cn_cdevsw = {
 	/* read */	cnread,
 	/* write */	cnwrite,
 	/* ioctl */	cnioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	cnpoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"console",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 9531f7b..238fdad 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -80,19 +80,14 @@ static struct cdevsw pts_cdevsw = {
 	/* read */	ptsread,
 	/* write */	ptswrite,
 	/* ioctl */	ptyioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"pts",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR_S,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
@@ -103,19 +98,14 @@ static struct cdevsw ptc_cdevsw = {
 	/* read */	ptcread,
 	/* write */	ptcwrite,
 	/* ioctl */	ptyioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ptcpoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"ptc",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR_C,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index e30b293..9105e26 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -49,19 +49,14 @@ static struct cdevsw snp_cdevsw = {
 	/* read */	snpread,
 	/* write */	snpwrite,
 	/* ioctl */	snpioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	snppoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"snp",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 1ee95bc..2d15c70 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -61,19 +61,14 @@ struct cdevsw ctty_cdevsw = {
 	/* read */	cttyread,
 	/* write */	cttywrite,
 	/* ioctl */	cttyioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	cttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"ctty",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };