7 files changed, 0 insertions, 41 deletions

diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index c6ebe0642dfb4..caa6fe3a6724d 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -109,12 +109,6 @@ acdattach(struct atapi_softc *atp)
 {
     struct acd_softc *cdp;
     struct changer *chp;
-    static int acd_cdev_done = 0;
-
-    if (!acd_cdev_done) {
-	cdevsw_add(&acd_cdevsw);
-	acd_cdev_done++;
-    }
 
     if ((cdp = acd_init_lun(atp, NULL)) == NULL) {
 	ata_printf(atp->controller, atp->unit, "acd: out of memory\n");
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index f70ed1adf3357..f4aac19dd0ad3 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -90,12 +90,6 @@ astattach(struct atapi_softc *atp)
     struct ast_softc *stp;
     struct ast_readposition position;
     dev_t dev;
-    static int ast_cdev_done = 0;
-
-    if (!ast_cdev_done) {
-	cdevsw_add(&ast_cdevsw);
-	ast_cdev_done = 1;
-    }
 
     stp = malloc(sizeof(struct ast_softc), M_AST, M_NOWAIT | M_ZERO);
     if (!stp) {
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index fa27d31283fe9..04663fddf37e3 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -438,10 +438,7 @@ dgbprobe(dev)
 	int i, v;
 	u_long win_size;  /* size of vizible memory window */
 	int unit=dev->id_unit;
-	static int once;
 
-	if (!once++)
-		cdevsw_add(&dgb_cdevsw);
 	sc->unit=dev->id_unit;
 	sc->port=dev->id_iobase;
 
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index c755004098d0f..b1e6e447cd859 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -189,10 +189,7 @@ static int
 ctxprobe(struct isa_device * devp)
 {
 	int     status;
-	static int once;
 
-	if (!once++)
-		cdevsw_add(&ctx_cdevsw);
 	if (inb(devp->id_iobase) == 0xff)	/* 0xff only if board absent */
 		status = 0;
 	else {
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 0c22df689baf4..2063db9555cff 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -1457,11 +1457,3 @@ atapi_dump(int ctrlr, int lun, char *label, void *data, int len)
 	while (--len > 0) printf ("-%x", *p++);
 	printf ("\n");
 }
-
-static void 
-acd_drvinit(void *unused)
-{
-    cdevsw_add(&acd_cdevsw);
-}
-
-SYSINIT(acddev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, acd_drvinit, NULL)
diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c
index fd6d66cab5b36..07f8d0aa52f0a 100644
--- a/sys/pc98/pc98/wfd.c
+++ b/sys/pc98/pc98/wfd.c
@@ -715,10 +715,3 @@ static int wfd_eject (struct wfd *t, int closeit)
 	return wfd_request_wait (t, ATAPI_START_STOP,
 		0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0);
 }
-
-static void 	wfd_drvinit(void *unused)
-{
-	cdevsw_add(&wfd_cdevsw);
-}
-
-SYSINIT(wfddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wfd_drvinit,NULL)
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 0f2c942022f79..5955610e1bf44 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -761,11 +761,3 @@ wst_reset(struct wst *t)
     outb(t->ata->port + AR_COMMAND, 0x08);
     DELAY(30);
 }
-
-static void 
-wst_drvinit(void *unused)
-{
-    cdevsw_add(&wst_cdevsw);
-}
-
-SYSINIT(wstdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wst_drvinit,NULL)