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

diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index ca50c9a..71f708f 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -539,6 +539,10 @@ register int		err = 0;
 static	const char *
 met_probe (pcici_t tag, pcidi_t type)
 {
+	static int once;
+
+	if (!once++)
+		cdevsw_add(&meteor_cdevsw);
 	
 	switch (type) {
 	case SAA7116_PHILIPS_ID:	/* meteor */
@@ -2095,22 +2099,4 @@ meteor_mmap(dev_t dev, vm_offset_t offset, int nprot)
 	return i386_btop(vtophys(mtr->bigbuf) + offset);
 }
 
-
-#if !defined(METEOR_FreeBSD_210)	/* XXX */
-static int meteor_devsw_installed;
-
-static void 	meteor_drvinit(void *unused)
-{
-	dev_t dev;
-
-	if( ! meteor_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR, 0);
-		cdevsw_add(&dev,&meteor_cdevsw, NULL);
-		meteor_devsw_installed = 1;
-    	}
-}
-
-SYSINIT(meteordev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,meteor_drvinit,NULL)
-#endif
-
 #endif /* NMETEOR > 0 */