Simplify cdevsw registration.

The cdevsw_add() function now finds the major number(s) in the
struct cdevsw passed to it.  cdevsw_add_generic() is no longer
needed, cdevsw_add() does the same thing.

cdevsw_add() will print an message if the d_maj field looks bogus.

Remove nblkdev and nchrdev variables.  Most places they were used
bogusly.  Instead check a dev_t for validity by seeing if devsw()
or bdevsw() returns NULL.

Move bdevsw() and devsw() functions to kern/kern_conf.c

Bump __FreeBSD_version to 400006

This commit removes:
        72 bogus makedev() calls
        26 bogus SYSINIT functions

if_xe.c bogusly accessed cdevsw[], author/maintainer please fix.

I4b and vinum not changed.  Patches emailed to authors.  LINT
probably broken until they catch up.

1 files changed, 2 insertions, 7 deletions

diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index 0f9eff8..93a4b39 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -36,7 +36,7 @@
  * future.
  */
 
-#ident "$Id: dpt_control.c,v 1.12 1999/05/13 05:24:53 jkh Exp $"
+#ident "$Id: dpt_control.c,v 1.13 1999/05/30 16:51:20 phk Exp $"
 
 #include "opt_dpt.h"
 
@@ -848,7 +848,6 @@ static          dpt_devsw_installed = 0;
 static void
 dpt_drvinit(void *unused)
 {
-	dev_t           dev;
 
 	if (!dpt_devsw_installed) {
 		if (bootverbose)
@@ -856,11 +855,7 @@ dpt_drvinit(void *unused)
 			       DPT_CTL_RELEASE, DPT_CTL_VERSION, DPT_CTL_PATCH);
 
 		/* Add the I/O (data) channel */
-		dev = makedev(CDEV_MAJOR, 0);
-		cdevsw_add(&dev, &dpt_cdevsw, NULL);
-		/* Add the Control (IOCTL) channel */
-		dev = makedev(CDEV_MAJOR, SCSI_CONTROL_MASK);
-		cdevsw_add(&dev, &dpt_cdevsw, NULL);
+		cdevsw_add(&dpt_cdevsw);
 
 		dpt_devsw_installed = 1;
 	}