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/cy | |
| 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/cy')
| -rw-r--r-- | sys/dev/cy/cy.c | 6 | ||||
| -rw-r--r-- | sys/dev/cy/cy_isa.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 70d0466..dd98d7a 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.88 1999/05/28 13:23:21 bde Exp $ + * $Id: cy.c,v 1.89 1999/05/30 16:52:11 phk Exp $ */ #include "opt_compat.h" @@ -541,7 +541,6 @@ cyattach_common(cy_iobase, cy_align) { int adapter; int cyu; - dev_t dev; u_char firmware_version; cy_addr iobase; int ncyu; @@ -633,8 +632,7 @@ cyattach_common(cy_iobase, cy_align) splx(s); if (!sio_registered) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev, &sio_cdevsw, NULL); + cdevsw_add(&sio_cdevsw); register_swi(SWI_TTY, siopoll); sio_registered = TRUE; } diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 70d0466..dd98d7a 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.88 1999/05/28 13:23:21 bde Exp $ + * $Id: cy.c,v 1.89 1999/05/30 16:52:11 phk Exp $ */ #include "opt_compat.h" @@ -541,7 +541,6 @@ cyattach_common(cy_iobase, cy_align) { int adapter; int cyu; - dev_t dev; u_char firmware_version; cy_addr iobase; int ncyu; @@ -633,8 +632,7 @@ cyattach_common(cy_iobase, cy_align) splx(s); if (!sio_registered) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev, &sio_cdevsw, NULL); + cdevsw_add(&sio_cdevsw); register_swi(SWI_TTY, siopoll); sio_registered = TRUE; } |
