From f400e58886c70a02dd0e2b4e79ddbcd85886d13a Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Wed, 26 Feb 2003 21:01:26 +0000
Subject: [PATCH] msg

---
 sys/coda/coda_fbsd.c    |  2 --
 sys/dev/iir/iir_ctrl.c  | 15 ---------------
 sys/fs/coda/coda_fbsd.c |  2 --
 sys/i386/isa/cx.c       |  9 ---------
 4 files changed, 28 deletions(-)

diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index 74a7eaa4031..6907c63b58c 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -202,7 +202,6 @@ static void coda_fbsd_drvinit(unused)
     int i;
 
     EVENTHANDLER_REGISTER(dev_clone,coda_fbsd_clone,0,1000);
-    cdevsw_add(&codadevsw);
     for(i=0;i<NVCODA;i++)
 	coda_mnttbl[i].dev = NULL; 
 }
@@ -216,7 +215,6 @@ static void coda_fbsd_drvuninit(unused)
     for(i=0;i<NVCODA;i++)
 	if(coda_mnttbl[i].dev)
 	    destroy_dev(coda_mnttbl[i].dev);
-    cdevsw_remove(&codadevsw);
 }
 
 SYSINIT(coda_fbsd_dev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+VC_DEV_NO,coda_fbsd_drvinit,NULL);
diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c
index 1b3fc166df3..7522b17e57d 100644
--- a/sys/dev/iir/iir_ctrl.c
+++ b/sys/dev/iir/iir_ctrl.c
@@ -85,7 +85,6 @@ static struct cdevsw iir_cdevsw = {
         /* kq */        nokqfilter
 };
 
-static int iir_devsw_installed = 0;
 #ifndef SDEV_PER_HBA
 static int sdev_made = 0;
 #endif
@@ -356,17 +355,3 @@ iir_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, d_thread_t * p)
     --gdt_stat.io_count_act;
     return (0);
 }
-
-static void
-iir_drvinit(void *unused)
-{
-    GDT_DPRINTF(GDT_D_DEBUG, ("iir_drvinit()\n"));
-                
-    if (!iir_devsw_installed) {
-        /* Add the I/O (data) channel */
-        cdevsw_add(&iir_cdevsw);
-        iir_devsw_installed = 1;
-    }
-}
-
-SYSINIT(iir_dev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, iir_drvinit, NULL)
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index 74a7eaa4031..6907c63b58c 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -202,7 +202,6 @@ static void coda_fbsd_drvinit(unused)
     int i;
 
     EVENTHANDLER_REGISTER(dev_clone,coda_fbsd_clone,0,1000);
-    cdevsw_add(&codadevsw);
     for(i=0;i<NVCODA;i++)
 	coda_mnttbl[i].dev = NULL; 
 }
@@ -216,7 +215,6 @@ static void coda_fbsd_drvuninit(unused)
     for(i=0;i<NVCODA;i++)
 	if(coda_mnttbl[i].dev)
 	    destroy_dev(coda_mnttbl[i].dev);
-    cdevsw_remove(&codadevsw);
 }
 
 SYSINIT(coda_fbsd_dev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+VC_DEV_NO,coda_fbsd_drvinit,NULL);
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index e902f84bdb1..e8144151f97 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -885,12 +885,3 @@ void cxtimeout (void *a)
 		}
 	timeout (cxtimeout, 0, hz*5);
 }
-
-
-static void 	cx_drvinit(void *unused)
-{
-
-	cdevsw_add(&cx_cdevsw);
-}
-
-SYSINIT(cxdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cx_drvinit,NULL)