summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/spigot.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-08-23 20:59:21 +0000
committerphk <phk@FreeBSD.org>1999-08-23 20:59:21 +0000
commit663cbe4fc26065f7af7d10faaee492a626156145 (patch)
tree32e619fadb473bfb85ff8e06044176f2ff323cce /sys/i386/isa/spigot.c
parent2a5ff1f726f814a9e4717afe3f14250f8030cace (diff)
downloadFreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.zip
FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.tar.gz
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().
Diffstat (limited to 'sys/i386/isa/spigot.c')
-rw-r--r--sys/i386/isa/spigot.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index b2ce86d..3b64ff5 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -51,7 +51,6 @@
error "Can only have 1 spigot configured."
#endif
-#include "opt_devfs.h"
#include "opt_spigot.h"
#include <sys/param.h>
@@ -61,9 +60,6 @@ error "Can only have 1 spigot configured."
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/mman.h>
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif /* DEVFS */
#include <machine/frame.h>
#include <machine/md_var.h>
@@ -78,9 +74,6 @@ static struct spigot_softc {
struct proc *p;
u_long signal_num;
u_short irq;
-#ifdef DEVFS
- void *devfs_token;
-#endif
} spigot_softc[NSPIGOT];
/* flags in softc */
@@ -159,12 +152,7 @@ spigot_attach(struct isa_device *devp)
devp->id_ointr = spigintr;
ss->maddr = kvtop(devp->id_maddr);
ss->irq = devp->id_irq;
-#ifdef DEVFS
- ss->devfs_token =
- devfs_add_devswf(&spigot_cdevsw, unit, DV_CHR, 0, 0, 0644,
- "spigot%d", unit);
-#endif
-
+ make_dev(&spigot_cdevsw, unit, 0, 0, 0644, "spigot%d", unit);
return 1;
}
OpenPOWER on IntegriCloud