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

diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 100f7f5..9ec75d7 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pccard.c,v 1.78 1999/05/04 15:43:02 wpaul Exp $
+ *	$Id: pccard.c,v 1.79 1999/05/30 16:53:28 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -185,6 +185,7 @@ pccard_configure(dummy)
 	printf("Initializing PC-card drivers:");
 	for (drv = drivers;  drv != NULL;  drv = drv->next)
 		printf(" %s", drv->name);
+	cdevsw_add(&crd_cdevsw);
 	printf("\n");
 }
 
@@ -1111,18 +1112,3 @@ find_driver(char *name)
 			return(drv);
 	return(0);
 }
-
-static void
-crd_drvinit(void *unused)
-{
-	static int crd_devsw_installed;
-	dev_t dev;
-
-	if (!crd_devsw_installed) {
-		dev = makedev(CDEV_MAJOR, 0);
-		cdevsw_add(&dev, &crd_cdevsw, NULL);
-		crd_devsw_installed = 1;
-	}
-}
-
-SYSINIT(crddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,crd_drvinit,NULL)