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, 11 deletions

diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index e3790e8..e82ed9e 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -152,21 +152,14 @@ typedef	struct streams_softc *sc_p;
 
 static sc_p sca[NSTREAMS];
 
-static void
-streamsattach(void *dummy)
-{
-	cdevsw_add_generic(CDEV_MAJOR, CDEV_MAJOR, &streams_cdevsw);
-}
-
 static	int
 streams_modevent(module_t mod, int type, void *unused)
 {
 	switch (type) {
 	case MOD_LOAD:
-		streamsattach(NULL);
+		cdevsw_add(&streams_cdevsw);
 		return 0;
 	case MOD_UNLOAD:
-		cdevsw[CDEV_MAJOR] = NULL;		/* clean up cdev */
 		return 0;
 	default:
 		break;
@@ -394,12 +387,10 @@ svr4_soo_close(struct file *fp, struct proc *p)
 static void             
 streams_drvinit(void *unused)
 {
-        dev_t dev;
 	int	unit;
 	sc_p scp  = sca[unit];
 
-	dev = makedev(CDEV_MAJOR, 0);
-	cdevsw_add(&dev, &streams_cdevsw, NULL);
+	cdevsw_add(&streams_cdevsw);
 	for (unit = 0; unit < NSTREAMS; unit++) {
 		/* 
 		 * Allocate storage for this instance .