14 files changed, 12 insertions, 69 deletions

diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 7d71019cdf98..3a50b03f9c68 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -98,7 +98,6 @@
 
 #ifdef __FreeBSD__
 #include "bktr.h"
-#include "opt_devfs.h"
 #endif /* __FreeBSD__ */
 
 #if (                                                            \
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 6dd3ba9489d7..7db3f83a805f 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -50,7 +50,6 @@
 
 #ifdef __FreeBSD__
 #include "bktr.h"
-#include "opt_devfs.h"
 #endif /* __FreeBSD__ */
 
 #include "opt_bktr.h"		/* include any kernel config options */
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 0dd13fb6424b..7b06a8914856 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -87,7 +87,6 @@
  *	Moffett Field, CA 94035
  */
 
-#include "opt_devfs.h"
 #include "ccd.h"
 
 #include <sys/param.h>
@@ -109,11 +108,6 @@
 
 #include <sys/ccdvar.h>
 
-#ifdef DEVFS
-#include <sys/eventhandler.h>
-#include <fs/devfs/devfs.h>
-#endif
-
 #if defined(CCDDEBUG) && !defined(DEBUG)
 #define DEBUG
 #endif
@@ -289,7 +283,6 @@ putccdbuf(struct ccdbuf *cbp)
 #define CCD_OFFSET 16
 #endif
 
-#ifdef DEVFS
 static void
 ccd_clone(void *arg, char *name, int namelen, dev_t *dev)
 {
@@ -298,7 +291,7 @@ ccd_clone(void *arg, char *name, int namelen, dev_t *dev)
 
 	if (*dev != NODEV)
 		return;
-	i = devfs_stdclone(name, &s, "ccd", &u);
+	i = dev_stdclone(name, &s, "ccd", &u);
 	if (i != 2)
 		return;
 	if (u >= numccd)
@@ -310,7 +303,6 @@ ccd_clone(void *arg, char *name, int namelen, dev_t *dev)
 	*dev = make_dev(&ccd_cdevsw, u * 8 + *s - 'a',
 		UID_ROOT, GID_OPERATOR, 0640, name);
 }
-#endif DEVFS
 
 /*
  * Called by main() during pseudo-device attachment.  All we need
@@ -348,9 +340,7 @@ ccdattach()
 	/* XXX: is this necessary? */
 	for (i = 0; i < numccd; ++i) 
 		ccddevs[i].ccd_dk = -1;
-#ifdef DEVFS
-	EVENTHANDLER_REGISTER(devfs_clone, ccd_clone, 0, 1000);
-#endif
+	EVENTHANDLER_REGISTER(dev_clone, ccd_clone, 0, 1000);
 }
 
 static int
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index dd513e9af7fc..c4b6a3c92177 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -52,7 +52,6 @@
  */
 
 #include "opt_fdc.h"
-#include "opt_devfs.h"
 #include "card.h"
 
 #include <sys/param.h>
@@ -84,12 +83,6 @@
 #include <isa/fdc.h>
 #include <isa/rtc.h>
 
-#ifdef DEVFS
-#include <sys/ctype.h>
-#include <sys/eventhandler.h>
-#include <fs/devfs/devfs.h>
-#endif
-
 /* misuse a flag to identify format operation */
 
 /* configuration flags */
@@ -952,7 +945,6 @@ DRIVER_MODULE(fdc, pccard, fdc_pccard_driver, fdc_devclass, 0, 0);
 
 #endif /* NCARD > 0 */
 
-#ifdef DEVFS
 static void fd_clone __P((void *arg, char *name, int namelen, dev_t *dev));
 
 static struct {
@@ -993,7 +985,7 @@ fd_clone(arg, name, namelen, dev)
 
 	if (*dev != NODEV)
 		return;
-	if (devfs_stdclone(name, &n, "fd", &u) != 2)
+	if (dev_stdclone(name, &n, "fd", &u) != 2)
 		return;
 	for (i = 0; ; i++) {
 		if (fd_suffix[i].match == NULL)
@@ -1011,7 +1003,6 @@ fd_clone(arg, name, namelen, dev)
 		*dev = make_dev_alias(pdev, name);
 	}
 }
-#endif
 
 /******************************************************************/
 /*
@@ -1163,20 +1154,15 @@ static int
 fd_attach(device_t dev)
 {
 	struct	fd_data *fd;
+	static int cdevsw_add_done = 0;
 
 	fd = device_get_softc(dev);
 
-#ifndef DEVFS
-	{
-	static int cdevsw_add_done = 0;
 	if (!cdevsw_add_done) {
-	    cdevsw_add(&fd_cdevsw);	/* XXX */
-	    cdevsw_add_done++;
-	}
+		cdevsw_add(&fd_cdevsw);	/* XXX */
+		cdevsw_add_done++;
 	}
-#else
-	EVENTHANDLER_REGISTER(devfs_clone, fd_clone, 0, 1000);
-#endif
+	EVENTHANDLER_REGISTER(dev_clone, fd_clone, 0, 1000);
 	make_dev(&fd_cdevsw, (fd->fdu << 6),
 		UID_ROOT, GID_OPERATOR, 0640, "fd%d", fd->fdu);
 
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 423b7139203c..9314af8f9078 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -12,7 +12,6 @@
 
 #include "opt_mfs.h"		/* We have adopted some tasks from MFS */
 #include "opt_md.h"
-#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -26,11 +25,6 @@
 #include <sys/linker.h>
 #include <sys/queue.h>
 
-#ifdef DEVFS
-#include <sys/eventhandler.h>
-#include <fs/devfs/devfs.h>
-#endif
-
 #ifndef MD_NSECT
 #define MD_NSECT (10000 * 2)
 #endif
@@ -124,10 +118,8 @@ mdopen(dev_t dev, int flag, int fmt, struct proc *p)
 			devtoname(dev), flag, fmt, p);
 
 	sc = dev->si_drv1;
-#ifndef DEVFS
-	if (sc->unit + 1 == mdunits)
+	if ((!devfs_present) && sc->unit + 1 == mdunits)
 		mdcreate_malloc(-1);
-#endif
 
 	dl = &sc->disk.d_label;
 	bzero(dl, sizeof(*dl));
@@ -411,7 +403,6 @@ mdcreate_malloc(int unit)
 	printf("md%d: Malloc disk\n", sc->unit);
 }
 
-#ifdef DEVFS
 static void
 md_clone (void *arg, char *name, int namelen, dev_t *dev)
 {
@@ -419,7 +410,7 @@ md_clone (void *arg, char *name, int namelen, dev_t *dev)
 
 	if (*dev != NODEV)
 		return;
-	i = devfs_stdclone(name, NULL, "md", &u);
+	i = dev_stdclone(name, NULL, "md", &u);
 	if (i == 0)
 		return;
 	/* XXX: should check that next char is [\0sa-h] */
@@ -431,7 +422,6 @@ md_clone (void *arg, char *name, int namelen, dev_t *dev)
 	mdcreate_malloc(u);
 	return;
 }
-#endif
 
 static void
 md_drvinit(void *unused)
@@ -463,11 +453,9 @@ md_drvinit(void *unused)
 		   mdunits, name, len, ptr);
 		mdcreate_preload(ptr, len);
 	} 
-#ifdef DEVFS
-	EVENTHANDLER_REGISTER(devfs_clone, md_clone, 0, 999);
-#else
-	mdcreate_malloc(-1);
-#endif
+	EVENTHANDLER_REGISTER(dev_clone, md_clone, 0, 999);
+	if (!devfs_present)
+		mdcreate_malloc(-1);
 }
 
 SYSINIT(mddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR, md_drvinit,NULL)
diff --git a/sys/dev/sound/isa/emu8000.c b/sys/dev/sound/isa/emu8000.c
index d69d67ca2137..65208ab3d5d6 100644
--- a/sys/dev/sound/isa/emu8000.c
+++ b/sys/dev/sound/isa/emu8000.c
@@ -32,9 +32,6 @@
  * 
  */
 
-
-#include "opt_devfs.h"
-
 #include <dev/sound/midi/midi.h>
 
 #include <isa/isavar.h>
diff --git a/sys/dev/sound/isa/mpu.c b/sys/dev/sound/isa/mpu.c
index 7fd89bb7364d..2ed93c119b87 100644
--- a/sys/dev/sound/isa/mpu.c
+++ b/sys/dev/sound/isa/mpu.c
@@ -37,8 +37,6 @@
  *
  */
 
-#include "opt_devfs.h"
-
 #include <dev/sound/midi/midi.h>
 #include <dev/sound/chip.h>
 #include <machine/cpufunc.h>
diff --git a/sys/dev/sound/isa/opl.c b/sys/dev/sound/isa/opl.c
index 3d2c9d632412..3669e4469b3e 100644
--- a/sys/dev/sound/isa/opl.c
+++ b/sys/dev/sound/isa/opl.c
@@ -44,8 +44,6 @@
  *
  */
 
-#include "opt_devfs.h"
-
 #include <dev/sound/midi/midi.h>
 #include <dev/sound/chip.h>
 
diff --git a/sys/dev/sound/isa/uartsio.c b/sys/dev/sound/isa/uartsio.c
index 9b43331a209d..56b4e5d47695 100644
--- a/sys/dev/sound/isa/uartsio.c
+++ b/sys/dev/sound/isa/uartsio.c
@@ -46,8 +46,6 @@
  *
  */
 
-#include "opt_devfs.h"
-
 #include <isa/sioreg.h>
 #include <isa/ic/ns16550.h>
 #include <dev/sound/midi/midi.h>
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 83152cf773b1..429a564d5cb8 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -50,8 +50,6 @@
  *
  */
 
-#include "opt_devfs.h"
-
 #include <dev/sound/midi/midi.h>
 
 static devclass_t midi_devclass;
diff --git a/sys/dev/sound/midi/midibuf.c b/sys/dev/sound/midi/midibuf.c
index 4e238000a0fc..5922a5b95022 100644
--- a/sys/dev/sound/midi/midibuf.c
+++ b/sys/dev/sound/midi/midibuf.c
@@ -35,8 +35,6 @@
  * transmit to or received from a midi interface.
  */
 
-#include "opt_devfs.h"
-
 #include <dev/sound/midi/midi.h>
 
 /* Some macros to handle the queue. */
diff --git a/sys/dev/sound/midi/midisynth.c b/sys/dev/sound/midi/midisynth.c
index 7d668fd83439..42a2a7ee5d78 100644
--- a/sys/dev/sound/midi/midisynth.c
+++ b/sys/dev/sound/midi/midisynth.c
@@ -34,8 +34,6 @@
  * midi messages, and vice versa.
  */
 
-#include "opt_devfs.h"
-
 #include <stddef.h>
 #include <dev/sound/midi/midi.h>
 
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index ba6a21d770f7..9ba15a4899d0 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -33,8 +33,6 @@
  * to and from a midi device or synthesizer.
  */
 
-#include "opt_devfs.h"
-
 #include <dev/sound/midi/midi.h>
 #include <dev/sound/midi/sequencer.h>
 
diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c
index 39ecda610fdc..74ebb6e7fd2c 100644
--- a/sys/dev/sound/pci/csamidi.c
+++ b/sys/dev/sound/pci/csamidi.c
@@ -26,8 +26,6 @@
  * $FreeBSD$
  */
 
-#include "opt_devfs.h"
-
 #include <dev/sound/midi/midi.h>
 #include <dev/sound/chip.h>
 #include <dev/sound/pci/csareg.h>