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.

5 files changed, 0 insertions, 10 deletions

diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index f71ae63..79cd1ab 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -56,7 +56,6 @@ static	d_close_t	i4bctlclose;
 static	d_ioctl_t	i4bctlioctl;
 static	d_poll_t	i4bctlpoll;
 
-#define CDEV_MAJOR 55
 
 static struct cdevsw i4bctl_cdevsw = {
 	.d_open =	i4bctlopen,
@@ -64,7 +63,6 @@ static struct cdevsw i4bctl_cdevsw = {
 	.d_ioctl =	i4bctlioctl,
 	.d_poll =	i4bctlpoll,
 	.d_name =	"i4bctl",
-	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4bctlattach(void *);
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index cb68c6c..f632186 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -110,7 +110,6 @@ static 	d_read_t	i4brbchwrite;
 static 	d_ioctl_t	i4brbchioctl;
 static 	d_poll_t	i4brbchpoll;
 
-#define CDEV_MAJOR 57
 
 static struct cdevsw i4brbch_cdevsw = {
 	.d_open =	i4brbchopen,
@@ -120,7 +119,6 @@ static struct cdevsw i4brbch_cdevsw = {
 	.d_ioctl =	i4brbchioctl,
 	.d_poll =	i4brbchpoll,
 	.d_name =	"i4brbch",
-	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4brbchattach(void *);
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index de0833d..5acce73 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -132,7 +132,6 @@ static d_read_t i4btelwrite;
 static d_ioctl_t i4btelioctl;
 static d_poll_t i4btelpoll;
 
-#define CDEV_MAJOR 56
 
 static struct cdevsw i4btel_cdevsw = {
 	.d_open =	i4btelopen,
@@ -142,7 +141,6 @@ static struct cdevsw i4btel_cdevsw = {
 	.d_ioctl =	i4btelioctl,
 	.d_poll =	i4btelpoll,
 	.d_name =	"i4btel",
-	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4btelattach(void *);
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index ea92b18..348c6dd 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -73,7 +73,6 @@ static d_read_t i4btrcread;
 static d_ioctl_t i4btrcioctl;
 static d_poll_t i4btrcpoll;
 
-#define CDEV_MAJOR 59
 
 static struct cdevsw i4btrc_cdevsw = {
 	.d_open =	i4btrcopen,
@@ -82,7 +81,6 @@ static struct cdevsw i4btrc_cdevsw = {
 	.d_ioctl =	i4btrcioctl,
 	.d_poll =	i4btrcpoll,
 	.d_name =	"i4btrc",
-	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4btrcattach(void *);
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index e17ad85..42330ef 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -76,7 +76,6 @@ static	d_read_t	i4bread;
 static	d_ioctl_t	i4bioctl;
 static	d_poll_t	i4bpoll;
 
-#define CDEV_MAJOR 60
 
 static struct cdevsw i4b_cdevsw = {
 	.d_open =	i4bopen,
@@ -85,7 +84,6 @@ static struct cdevsw i4b_cdevsw = {
 	.d_ioctl =	i4bioctl,
 	.d_poll =	i4bpoll,
 	.d_name =	"i4b",
-	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4battach(void *);