Device megapatch 1/6:

Free approx 86 major numbers with a mostly automatically generated patch.

A number of strategic drivers have been left behind by caution, and a few
because they still (ab)use their major number.

7 files changed, 1 insertions, 16 deletions

diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 3b99613..03eaf54 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -630,7 +630,6 @@ static struct periph_driver probe_driver =
 PERIPHDRIVER_DECLARE(xpt, xpt_driver);
 PERIPHDRIVER_DECLARE(probe, probe_driver);
 
-#define XPT_CDEV_MAJOR 104
 
 static d_open_t xptopen;
 static d_close_t xptclose;
@@ -641,7 +640,6 @@ static struct cdevsw xpt_cdevsw = {
 	.d_close =	xptclose,
 	.d_ioctl =	xptioctl,
 	.d_name =	"xpt",
-	.d_maj =	XPT_CDEV_MAJOR,
 };
 
 static struct intr_config_hook *xpt_config_hook;
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 1ece680..a9ed373 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -174,7 +174,6 @@ struct ch_softc {
 };
 
 #define CHUNIT(x)       (minor((x)))
-#define CH_CDEV_MAJOR	17
 
 static	d_open_t	chopen;
 static	d_close_t	chclose;
@@ -217,7 +216,6 @@ static struct cdevsw ch_cdevsw = {
 	.d_close =	chclose,
 	.d_ioctl =	chioctl,
 	.d_name =	"ch",
-	.d_maj =	CH_CDEV_MAJOR,
 };
 
 static void
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 6aa7568..13c1017 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -77,7 +77,6 @@ struct pass_softc {
 	dev_t			dev;
 };
 
-#define PASS_CDEV_MAJOR 31
 
 static	d_open_t	passopen;
 static	d_close_t	passclose;
@@ -110,7 +109,6 @@ static struct cdevsw pass_cdevsw = {
 	.d_close =	passclose,
 	.d_ioctl =	passioctl,
 	.d_name =	"pass",
-	.d_maj =	PASS_CDEV_MAJOR,
 };
 
 static void
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 72e5290..cc3afa6c 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -116,7 +116,6 @@ static struct periph_driver ptdriver =
 
 PERIPHDRIVER_DECLARE(pt, ptdriver);
 
-#define PT_CDEV_MAJOR 61
 
 static struct cdevsw pt_cdevsw = {
 	.d_open =	ptopen,
@@ -126,7 +125,6 @@ static struct cdevsw pt_cdevsw = {
 	.d_ioctl =	ptioctl,
 	.d_strategy =	ptstrategy,
 	.d_name =	"pt",
-	.d_maj =	PT_CDEV_MAJOR,
 };
 
 #ifndef SCSI_PT_DEFAULT_TIMEOUT
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index adb22f84..c41e416 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -423,7 +423,6 @@ PERIPHDRIVER_DECLARE(sa, sadriver);
 #define D_TAPE 0
 #endif
 
-#define SA_CDEV_MAJOR 14
 
 static struct cdevsw sa_cdevsw = {
 	.d_open =	saopen,
@@ -433,7 +432,6 @@ static struct cdevsw sa_cdevsw = {
 	.d_ioctl =	saioctl,
 	.d_strategy =	sastrategy,
 	.d_name =	"sa",
-	.d_maj =	SA_CDEV_MAJOR,
 	.d_flags =	D_TAPE,
 };
 
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 7381787..8f594ae 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -153,7 +153,6 @@ struct ses_softc {
 #define	SES_FLAG_INITIALIZED	0x04
 
 #define SESUNIT(x)       (minor((x)))
-#define SES_CDEV_MAJOR	110
 
 static	d_open_t	sesopen;
 static	d_close_t	sesclose;
@@ -175,13 +174,11 @@ static struct periph_driver sesdriver = {
 
 PERIPHDRIVER_DECLARE(ses, sesdriver);
 
-static struct cdevsw ses_cdevsw = 
-{
+static struct cdevsw ses_cdevsw = {
 	.d_open =	sesopen,
 	.d_close =	sesclose,
 	.d_ioctl =	sesioctl,
 	.d_name =	"ses",
-	.d_maj =	SES_CDEV_MAJOR,
 };
 
 static void
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 749447f..7e0d28f 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -104,7 +104,6 @@ static int		targreadfilt(struct knote *kn, long hint);
 static struct filterops targread_filtops =
 	{ 1, NULL, targreadfiltdetach, targreadfilt };
 
-#define TARG_CDEV_MAJOR 65
 static struct cdevsw targ_cdevsw = {
 	.d_open =	targopen,
 	.d_close =	targclose,
@@ -113,7 +112,6 @@ static struct cdevsw targ_cdevsw = {
 	.d_ioctl =	targioctl,
 	.d_poll =	targpoll,
 	.d_name =	"targ",
-	.d_maj =	TARG_CDEV_MAJOR,
 	.d_kqfilter =	targkqfilter
 };