From 15c4b54f77bc19aaab96dc0ddcea9cf147dca5f7 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Wed, 26 Feb 2003 21:10:04 +0000
Subject: NODEVFS cleanup:

Don't call cdevsw_{add,remove}()
Remove remnants of the previous DEVFS.
---
 sys/i4b/driver/i4b_ctl.c    | 15 ---------------
 sys/i4b/driver/i4b_rbch.c   | 16 ----------------
 sys/i4b/driver/i4b_tel.c    | 17 -----------------
 sys/i4b/driver/i4b_trace.c  | 16 ----------------
 sys/i4b/layer4/i4b_i4bdrv.c | 12 ------------
 5 files changed, 76 deletions(-)

(limited to 'sys')

diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index bafe362..9a2b789 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -41,10 +41,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
-
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
@@ -82,17 +78,6 @@ static void i4bctlattach(void *);
 PSEUDO_SET(i4bctlattach, i4b_i4bctldrv);
 
 /*---------------------------------------------------------------------------*
- *	initialization at kernel load time
- *---------------------------------------------------------------------------*/
-static void
-i4bctlinit(void *unused)
-{
-	cdevsw_add(&i4bctl_cdevsw);
-}
-
-SYSINIT(i4bctldev, SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR, &i4bctlinit, NULL);
-
-/*---------------------------------------------------------------------------*
  *	interface attach routine
  *---------------------------------------------------------------------------*/
 static void
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 3b85c9a..10b9add 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -47,10 +47,6 @@
 
 #include <net/if.h>
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
-
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_rbch_ioctl.h>
 #include <machine/i4b_debug.h>
@@ -140,18 +136,6 @@ PSEUDO_SET(i4brbchattach, i4b_rbch);
  *===========================================================================*/
 
 /*---------------------------------------------------------------------------*
- *	initialization at kernel load time
- *---------------------------------------------------------------------------*/
-static void
-i4brbchinit(void *unused)
-{
-	cdevsw_add(&i4brbch_cdevsw);
-}
-
-SYSINIT(i4brbchdev, SI_SUB_DRIVERS,
-	SI_ORDER_MIDDLE+CDEV_MAJOR, &i4brbchinit, NULL);
-
-/*---------------------------------------------------------------------------*
  *	interface attach routine
  *---------------------------------------------------------------------------*/
 static void
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 22a1dc1..b4e54d8 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -49,10 +49,6 @@
 #include <net/if.h>
 #include <sys/tty.h>
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
-
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_tel_ioctl.h>
 #include <machine/i4b_debug.h>
@@ -155,7 +151,6 @@ static struct cdevsw i4btel_cdevsw = {
 	/* flags */     0,
 };
 
-static void i4btelinit(void *unused);
 static void i4btelattach(void *);
 
 PSEUDO_SET(i4btelattach, i4b_tel);
@@ -165,18 +160,6 @@ PSEUDO_SET(i4btelattach, i4b_tel);
  *===========================================================================*/
 
 /*---------------------------------------------------------------------------*
- *	initialization at kernel load time
- *---------------------------------------------------------------------------*/
-static void
-i4btelinit(void *unused)
-{
-	cdevsw_add(&i4btel_cdevsw);
-}
-
-SYSINIT(i4bteldev, SI_SUB_DRIVERS,
-	SI_ORDER_MIDDLE+CDEV_MAJOR, &i4btelinit, NULL);
-
-/*---------------------------------------------------------------------------*
  *	interface attach routine
  *---------------------------------------------------------------------------*/
 static void
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 2fc2443..fe374d8 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -48,10 +48,6 @@
 #include <net/if.h>
 #include <sys/tty.h>
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
-
 #include <machine/i4b_trace.h>
 #include <machine/i4b_ioctl.h>
 
@@ -95,18 +91,6 @@ static struct cdevsw i4btrc_cdevsw = {
         /* flags */     0,
 };
 
-/*---------------------------------------------------------------------------*
- *	interface init routine
- *---------------------------------------------------------------------------*/
-static
-void i4btrcinit(void *unused)
-{
-	cdevsw_add(&i4btrc_cdevsw);
-}
-
-SYSINIT(i4btrcdev, SI_SUB_DRIVERS,
-	SI_ORDER_MIDDLE+CDEV_MAJOR, &i4btrcinit, NULL);
-
 static void i4btrcattach(void *);
 PSEUDO_SET(i4btrcattach, i4b_trace);
 
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 1dffc0f..2f31608 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -51,10 +51,6 @@
 #include "i4bing.h"
 #include "i4bisppp.h"
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
-
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_cause.h>
@@ -101,14 +97,6 @@ static struct cdevsw i4b_cdevsw = {
 static void i4battach(void *);
 PSEUDO_SET(i4battach, i4b_i4bdrv);
 
-static void
-i4b_drvinit(void *unused)
-{
-	cdevsw_add(&i4b_cdevsw);
-}
-
-SYSINIT(i4bdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,i4b_drvinit,NULL)
-
 /*---------------------------------------------------------------------------*
  *	interface attach routine
  *---------------------------------------------------------------------------*/
-- 
cgit v1.1