summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-02-27 07:36:03 +0000
committerphk <phk@FreeBSD.org>2003-02-27 07:36:03 +0000
commit2a06a7170d947ccd49b48f02a99b12105ddebcc7 (patch)
tree846cf95a20978987a74507d2af42873519dc2e4a
parentf544845967577250708bccc777f944fa47dd73a3 (diff)
downloadFreeBSD-src-2a06a7170d947ccd49b48f02a99b12105ddebcc7.zip
FreeBSD-src-2a06a7170d947ccd49b48f02a99b12105ddebcc7.tar.gz
NODEVFS cleanup:
Don't call devsw_{add,delete}(). These two drivers are actually broken, and have been for quite some time.
-rw-r--r--sys/i386/isa/istallion.c7
-rw-r--r--sys/i386/isa/stallion.c11
2 files changed, 6 insertions, 12 deletions
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 10b292e..35aa836 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -815,10 +815,6 @@ static int stliprobe(struct isa_device *idp)
{
stlibrd_t *brdp;
int btype, bclass;
- static int once;
-
- if (!once++)
- cdevsw_add(&stli_cdevsw);
#if DEBUG
printf("stliprobe(idp=%x): unit=%d iobase=%x flags=%x\n", (int) idp,
@@ -919,6 +915,9 @@ static int stliattach(struct isa_device *idp)
return(0);
if (brdp->state & BST_FOUND)
stli_brdattach(brdp);
+ if (0) {
+ make_dev(&stli_cdevsw, 0, 0, 0, 0, "istallion_is_broken");
+ }
return(1);
}
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 77db37f..1d8c666 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -552,14 +552,6 @@ static struct cdevsw stl_cdevsw = {
/* kqfilter */ ttykqfilter,
};
-static void stl_drvinit(void *unused)
-{
-
- cdevsw_add(&stl_cdevsw);
-}
-
-SYSINIT(sidev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,stl_drvinit,NULL)
-
#endif
/*****************************************************************************/
@@ -662,6 +654,9 @@ static int stlattach(struct isa_device *idp)
brdp->irqtype = stl_irqshared;
stl_brdinit(brdp);
+ if (0) {
+ make_dev(&stl_cdevsw, 0, 0, 0, 0, "stallion_is_broken");
+ }
return(1);
}
OpenPOWER on IntegriCloud