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

35 files changed, 19 insertions, 176 deletions

diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 620da5825583..d6752b743f18 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -108,19 +108,14 @@ static struct cdevsw apm_cdevsw = {
 	/* read */	noread,
 	/* write */	apmwrite,
 	/* ioctl */	apmioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	apmpoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"apm",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 620da5825583..d6752b743f18 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -108,19 +108,14 @@ static struct cdevsw apm_cdevsw = {
 	/* read */	noread,
 	/* write */	apmwrite,
 	/* ioctl */	apmioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	apmpoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"apm",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 42e9b14114d7..999837942dd6 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -84,19 +84,14 @@ static struct cdevsw mem_cdevsw = {
 	/* read */	mmrw,
 	/* write */	mmrw,
 	/* ioctl */	mmioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	mmpoll,
 	/* mmap */	memmmap,
 	/* strategy */	nostrategy,
 	/* name */	"mem",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_MEM,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index 60775d1329d7..574f416df2be 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -65,19 +65,14 @@ static struct cdevsw perfmon_cdevsw = {
 	/* read */      noread,
 	/* write */     nowrite,
 	/* ioctl */     perfmon_ioctl,
-	/* stop */      nostop,
-	/* reset */     noreset,
-	/* devtotty */  nodevtotty,
 	/* poll */      nopoll,
 	/* mmap */      nommap,
 	/* strategy */  nostrategy,
 	/* name */      "perfmon",
-	/* parms */     noparms,
 	/* maj */       CDEV_MAJOR,
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* maxio */     0,
 	/* bmaj */      -1
 };
 
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index b03cf04b3f23..bcb344a7abc5 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -193,19 +193,14 @@ static struct cdevsw asc_cdevsw = {
 	/* read */	ascread,
 	/* write */	nowrite,
 	/* ioctl */	ascioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ascpoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"asc",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index e4b9ddcaaf4c..a494a6c7e3ee 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/atapi-cd.c
@@ -62,19 +62,14 @@ static struct cdevsw acd_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	acdioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	acdstrategy,
 	/* name */	"wcd",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	BDEV_MAJOR
 };
 
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index efd84295f29d..462ca2883a57 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -146,19 +146,14 @@ static struct cdevsw ctx_cdevsw = {
 	/* read */	ctxread,
 	/* write */	ctxwrite,
 	/* ioctl */	ctxioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"ctx",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 0f5f40819d5f..1eeb42ec292a 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -97,19 +97,14 @@ struct cdevsw cx_cdevsw = {
 	/* read */	cxread,
 	/* write */	cxwrite,
 	/* ioctl */	cxioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"cx",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 #else
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 8f2109c8cfeb..472544a00f91 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -378,19 +378,14 @@ static struct cdevsw sio_cdevsw = {
 	/* read */	sioread,
 	/* write */	siowrite,
 	/* ioctl */	sioioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	driver_name,
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index a809a2eaddc5..58a35a6af4cf 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -16,6 +16,7 @@
  * or modify this software as long as this message is kept with the software,
  * all derivative works or modified versions.
  *
+ * $FreeBSD$
  *
  */
 /*Please read the README file for usage information*/
@@ -75,19 +76,14 @@ static struct cdevsw gp_cdevsw = {
 	/* read */	noread,
 	/* write */	gpwrite,
 	/* ioctl */	gpioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"gp",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index b7f429a90a35..3b3f0f3c8a43 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -30,6 +30,9 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
  */
 
 #include "gsc.h"
@@ -188,19 +191,14 @@ static struct cdevsw gsc_cdevsw = {
 	/* read */	gscread,
 	/* write */	nowrite,
 	/* ioctl */	gscioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"gsc",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 9ca227598cca..c0c7f9fa391f 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -640,19 +640,14 @@ static struct cdevsw stli_cdevsw = {
 	/* read */	stliread,
 	/* write */	stliwrite,
 	/* ioctl */	stliioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	stli_drvname,
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index 56c90d1fc377..5d2395897a7e 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -25,6 +25,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ * $FreeBSD$
+ *
  */
 #include "joy.h"
 
@@ -89,19 +91,14 @@ static struct cdevsw joy_cdevsw = {
 	/* read */	joyread,
 	/* write */	nowrite,
 	/* ioctl */	joyioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"joy",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index a19b86a5dc82..54d7dca6abca 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -37,6 +37,9 @@
  * Written by:
  * Peter Dufault
  * dufault@hda.com
+ *
+ * $FreeBSD$
+ *
  */
 
 #include "labpc.h"
@@ -289,19 +292,14 @@ static struct cdevsw labpc_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	labpcioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	labpcstrategy,
 	/* name */	"labpc",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index a5d64efb6f74..66166b15250e 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -628,19 +628,14 @@ static struct cdevsw loran_cdevsw = {
 	/* read */	loranread,
 	/* write */	loranwrite,
 	/* ioctl */	noioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"loran",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 2125a6277864..f0ec9e7c738e 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -514,19 +514,14 @@ static struct cdevsw matcd_cdevsw = {
 	/* read */	physread,
 	/* write */	nowrite,
 	/* ioctl */	matcdioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	matcdstrategy,
 	/* name */	"matcd",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	BDEV_MAJOR
 };
 
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index b49cd55dd8e8..e4da168e3807 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -214,19 +214,14 @@ static struct cdevsw mcd_cdevsw = {
 	/* read */	physread,
 	/* write */	nowrite,
 	/* ioctl */	mcdioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	mcdstrategy,
 	/* name */	"mcd",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	BDEV_MAJOR
 };
 
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index f6d6c663652b..5f9f2c071523 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -83,19 +83,14 @@ static struct cdevsw mse_cdevsw = {
 	/* read */	mseread,
 	/* write */	nowrite,
 	/* ioctl */	mseioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	msepoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"mse",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 62875bf487c8..7c913b2486e3 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -136,19 +136,14 @@ static struct cdevsw pca_cdevsw = {
 	/* read */	noread,
 	/* write */	pcawrite,
 	/* ioctl */	pcaioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	pcapoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"pca",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 8e5c26d687c4..601be1a1b83d 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -132,19 +132,14 @@ static struct cdevsw pc_cdevsw = {
 	/* read */	pcread,
 	/* write */	pcwrite,
 	/* ioctl */	pcioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	pcmmap,
 	/* strategy */	nostrategy,
 	/* name */	"vt",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 238a05214b9a..91b735e321f1 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -98,19 +98,14 @@ static struct cdevsw rc_cdevsw = {
 	/* read */	rcread,
 	/* write */	rcwrite,
 	/* ioctl */	rcioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"rc",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index d788b57a5150..5a4ccebaebee 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -805,19 +805,14 @@ static struct cdevsw rp_cdevsw = {
 	/* read */	rpread,
 	/* write */	rpwrite,
 	/* ioctl */	rpioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	driver_name,
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index b76c2d61ce10..a615f499285b 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -187,19 +187,14 @@ static struct cdevsw scd_cdevsw = {
 	/* read */	physread,
 	/* write */	nowrite,
 	/* ioctl */	scdioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	scdstrategy,
 	/* name */	"scd",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	BDEV_MAJOR
 };
 
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index a1cde6e3d924..79097caaa543 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -180,19 +180,14 @@ static struct cdevsw si_cdevsw = {
 	/* read */	siread,
 	/* write */	siwrite,
 	/* ioctl */	siioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"si",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c
index 4e2062fe71b0..bf980fd5b825 100644
--- a/sys/i386/isa/snd/sound.c
+++ b/sys/i386/isa/snd/sound.c
@@ -48,6 +48,8 @@
  * device parameters, then call the board-specific routines if
  * available, or try to perform the task using the default code.
  *
+ * $FreeBSD$
+ *
  */
 
 #include <i386/isa/snd/sound.h>
@@ -75,19 +77,14 @@ static struct cdevsw snd_cdevsw = {
 	/* read */	sndread,
 	/* write */	sndwrite,
 	/* ioctl */	sndioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	sndselect,
 	/* mmap */	sndmmap,
 	/* strategy */	nostrategy,
 	/* name */	"snd",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 746ea9b017cb..98656c85befa 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -24,7 +24,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
+ * $FreeBSD$
+ *
  */
 #include <i386/isa/sound/sound_config.h>
 #if NSND > 0	/* from "snd.h" */
@@ -92,19 +94,14 @@ static struct cdevsw snd_cdevsw = {
 	/* read */	sndread,
 	/* write */	sndwrite,
 	/* ioctl */	sndioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	sndpoll,
 	/* mmap */	sndmmap,
 	/* strategy */	nostrategy,
 	/* name */	driver_name,
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 3b64ff5cee82..816ec1eec782 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -42,6 +42,8 @@
  *
  * Version 1.7, December 1995.
  *
+ * $FreeBSD$
+ *
  */
 
 #include	"spigot.h"
@@ -101,19 +103,14 @@ static struct cdevsw spigot_cdevsw = {
 	/* read */	spigot_read,
 	/* write */	spigot_write,
 	/* ioctl */	spigot_ioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	spigot_mmap,
 	/* strategy */	nostrategy,
 	/* name */	"spigot",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 39d50c4c923a..10cc4a1be0f5 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -34,19 +34,14 @@ static struct cdevsw spkr_cdevsw = {
 	/* read */	noread,
 	/* write */	spkrwrite,
 	/* ioctl */	spkrioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"spkr",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 99cef0391202..76e91193eb6c 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -535,19 +535,14 @@ static struct cdevsw stl_cdevsw = {
 	/* read */	stlread,
 	/* write */	stlwrite,
 	/* ioctl */	stlioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"stl",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 3556255ec0b6..be85785b46ba 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -27,6 +27,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
  */
 
 #include "tw.h"
@@ -221,19 +224,14 @@ static struct cdevsw tw_cdevsw = {
 	/* read */	twread,
 	/* write */	twwrite,
 	/* ioctl */	noioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	twpoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"tw",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index ed856615a776..1e90fcba6983 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -242,19 +242,14 @@ static struct cdevsw wd_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	wdioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	wdstrategy,
 	/* name */	"wd",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	wddump,
 	/* psize */	wdsize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	BDEV_MAJOR
 };
 
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index e4b9ddcaaf4c..a494a6c7e3ee 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_cd.c
@@ -62,19 +62,14 @@ static struct cdevsw acd_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	acdioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	acdstrategy,
 	/* name */	"wcd",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	BDEV_MAJOR
 };
 
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index 21fdb4410798..696e98eb38fa 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -63,19 +63,14 @@ static struct cdevsw wfd_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	wfdioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	wfdstrategy,
 	/* name */	"wfd",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	BDEV_MAJOR
 };
 
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 4c0b912da486..d21832514383 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -57,19 +57,14 @@ static struct cdevsw wst_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	wstioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	wststrategy,
 	/* name */	"wst",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 735869c58964..f7fdebb034d7 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -190,19 +190,14 @@ static struct cdevsw wt_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	wtioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	wtstrategy,
 	/* name */	"wt",
-	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };