diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
| commit | 9dcbe2404a244059708f3bbc8cbfa0a14887c4ea (patch) | |
| tree | 627cf9c78fb38268a3abc09deb78d86c316d87e6 /sys/i386/isa/spkr.c | |
| parent | d9183205179005f7582d41a23d4588b0b1140298 (diff) | |
| download | src-9dcbe2404a244059708f3bbc8cbfa0a14887c4ea.tar.gz src-9dcbe2404a244059708f3bbc8cbfa0a14887c4ea.zip | |
Convert DEVFS hooks in (most) drivers to make_dev().
Diskslice/label code not yet handled.
Vinum, i4b, alpha, pc98 not dealt with (left to respective Maintainers)
Add the correct hook for devfs to kern_conf.c
The net result of this excercise is that a lot less files depends on DEVFS,
and devtoname() gets more sensible output in many cases.
A few drivers had minor additional cleanups performed relating to cdevsw
registration.
A few drivers don't register a cdevsw{} anymore, but only use make_dev().
Notes
Notes:
svn path=/head/; revision=50254
Diffstat (limited to 'sys/i386/isa/spkr.c')
| -rw-r--r-- | sys/i386/isa/spkr.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index b11251f4860a..29f82055c98a 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -4,15 +4,13 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.38 1999/08/17 20:25:49 billf Exp $ + * $Id: spkr.c,v 1.39 1999/08/23 20:35:17 bde Exp $ */ #include "speaker.h" #if NSPEAKER > 0 -#include "opt_devfs.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -24,11 +22,6 @@ #include <machine/clock.h> #include <machine/speaker.h> -#ifdef DEVFS -#include <sys/devfsext.h> -static void *devfs_token; -#endif - static d_open_t spkropen; static d_close_t spkrclose; static d_write_t spkrwrite; @@ -604,11 +597,7 @@ spkrioctl(dev, cmd, cmdarg, flags, p) static void spkr_drvinit(void *unused) { - cdevsw_add(&spkr_cdevsw); -#ifdef DEVFS - devfs_token = devfs_add_devswf(&spkr_cdevsw, 0, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, "speaker"); -#endif + make_dev(&spkr_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "speaker"); } SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL) |