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, 5 insertions, 17 deletions

diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index f411f8a..5eed57e 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.c,v 1.11 1999/05/09 13:00:37 phk Exp $
+ *	$Id: smb.c,v 1.12 1999/05/30 16:51:37 phk Exp $
  *
  */
 #include <sys/param.h>
@@ -122,6 +122,10 @@ static int
 smb_probe(device_t dev)
 {
 	struct smb_softc *sc = (struct smb_softc *)device_get_softc(dev);
+	static int once;
+
+	if (!once++)
+                cdevsw_add(&smb_cdevsw);
 
 	sc->sc_addr = smbus_get_addr(dev);
 
@@ -272,21 +276,5 @@ smbioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 	return (error);
 }
 
-static int smb_devsw_installed = 0;
-
-static void
-smb_drvinit(void *unused)
-{
-        dev_t dev;
-
-        if( ! smb_devsw_installed ) {
-                dev = makedev(CDEV_MAJOR,0);
-                cdevsw_add(&dev,&smb_cdevsw,NULL);
-                smb_devsw_installed = 1;
-        }
-}
-
 DEV_DRIVER_MODULE(smb, smbus, smb_driver, smb_devclass, CDEV_MAJOR, NOMAJ,
 			smb_cdevsw, 0, 0);
-
-SYSINIT(smbdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,smb_drvinit,NULL)