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, 1 insertions, 18 deletions

diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 180252b..d1b9798 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -417,6 +417,7 @@ labpcinit(void)
 		bzero(labpcs, NLABPC * sizeof(struct ctlr *));
 		return 1;
 	}
+	cdevsw_add(&labpc_cdevsw);
 	return 0;
 }
 
@@ -1099,21 +1100,3 @@ labpcioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
 			return ENOTTY;
 	}
 }
-
-
-static int	labpc_devsw_installed = 0;
-
-static void 	labpc_drvinit(void *unused)
-{
-	dev_t dev;
-
-	if( ! labpc_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR,0);
-		cdevsw_add(&dev,&labpc_cdevsw,NULL);
-		labpc_devsw_installed = 1;
-    	}
-}
-
-SYSINIT(labpcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,labpc_drvinit,NULL)
-
-