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, 0 insertions, 40 deletions

diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index d203aa1..0c3909d 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -562,19 +562,14 @@ static struct cdevsw xpt_cdevsw = {
 	/* read */	noread,
 	/* write */	nowrite,
 	/* ioctl */	xptioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"xpt",
-	/* parms */	noparms,
 	/* maj */	XPT_CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 5e9d1d2..a66231e 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -248,19 +248,14 @@ static struct cdevsw cd_cdevsw = {
 	/* read */	physread,
 	/* write */	nowrite,
 	/* ioctl */	cdioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	cdstrategy,
 	/* name */	"cd",
-	/* parms */	noparms,
 	/* maj */	CD_CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	CD_BDEV_MAJOR
 };
 
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 27d04e3..cc1bdb7 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -219,19 +219,14 @@ static struct cdevsw ch_cdevsw = {
 	/* read */	noread,
 	/* write */	nowrite,
 	/* ioctl */	chioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"ch",
-	/* parms */	noparms,
 	/* maj */	CH_CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index aa2ff80..6f29732 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -243,19 +243,14 @@ static struct cdevsw da_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	daioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	dastrategy,
 	/* name */	"da",
-	/* parms */	noparms,
 	/* maj */	DA_CDEV_MAJOR,
 	/* dump */	dadump,
 	/* psize */	dasize,
 	/* flags */	D_DISK,
-	/* maxio */	0,
 	/* bmaj */	DA_BDEV_MAJOR
 };
 
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 95b2204..4dbcabb 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -119,19 +119,14 @@ static struct cdevsw pass_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	passioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	passstrategy,
 	/* name */	"pass",
-	/* parms */	noparms,
 	/* maj */	PASS_CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 72350cb..1c29548 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -123,19 +123,14 @@ static struct cdevsw pt_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	ptioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	ptstrategy,
 	/* name */	"pt",
-	/* parms */	noparms,
 	/* maj */	PT_CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 225b32e..8fe675d 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -349,19 +349,14 @@ static struct cdevsw sa_cdevsw = {
 	/* read */	physread,
 	/* write */	physwrite,
 	/* ioctl */	saioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
 	/* mmap */	nommap,
 	/* strategy */	sastrategy,
 	/* name */	"sa",
-	/* parms */	noparms,
 	/* maj */	SA_CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TAPE,
-	/* maxio */	0,
 	/* bmaj */	-1
 };
 
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 70a50ea..0a16385 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -172,19 +172,14 @@ static struct cdevsw targ_cdevsw = {
 	/* read */	targread,
 	/* write */	targwrite,
 	/* ioctl */	targioctl,
-	/* stop */	nostop,
-	/* reset */	noreset,
-	/* devtotty */	nodevtotty,
 	/* poll */	targpoll,
 	/* mmap */	nommap,
 	/* strategy */	targstrategy,
 	/* name */	"targ",
-	/* parms */	noparms,
 	/* maj */	TARG_CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* maxio */	0,
 	/* bmaj */	-1
 };