diff options
| author | phk <phk@FreeBSD.org> | 1999-05-31 11:29:30 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-05-31 11:29:30 +0000 |
| commit | 6a5dc97620c08ad609e1b3c3c042f150feb46dd3 (patch) | |
| tree | 6cfc9338ae83f67fd38a853cd0782713c73cad13 /sys/dev/si | |
| parent | 881e2636833297a207a791fabd8befc818b1b3fb (diff) | |
| download | FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.zip FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.tar.gz | |
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.
Diffstat (limited to 'sys/dev/si')
| -rw-r--r-- | sys/dev/si/si.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 0565390..18d8377 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.85 1999/05/09 17:07:21 peter Exp $ + * $Id: si.c,v 1.86 1999/05/30 16:52:25 phk Exp $ */ #ifndef lint @@ -2832,13 +2832,8 @@ static int si_devsw_installed; static void si_drvinit(void *unused) { - dev_t dev; - if (!si_devsw_installed) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&si_cdevsw, NULL); - si_devsw_installed = 1; - } + cdevsw_add(&si_cdevsw); } SYSINIT(sidev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,si_drvinit,NULL) |
