From: Sascha Wildner <saw@online.de>
Date: Sat, 23 Feb 2013 12:21:02 +0000 (+0100)
Subject: kernel/isa: Remove empty isa_init() (formerly used for COMPAT_OLDISA).
X-Git-Tag: v3.4.0rc~225
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/c6cf216fb426a0297a6b22bf7217ef4ed77d0d2a

kernel/isa: Remove empty isa_init() (formerly used for COMPAT_OLDISA).
---

diff --git a/sys/bus/isa/i386/isa.c b/sys/bus/isa/i386/isa.c
index 4e38377d20..26999907df 100644
--- a/sys/bus/isa/i386/isa.c
+++ b/sys/bus/isa/i386/isa.c
@@ -65,11 +65,6 @@
 #include "../isavar.h"
 #include "../isa_common.h"
 
-void
-isa_init(void)
-{
-}
-
 /*
  * This implementation simply passes the request up to the parent
  * bus, which in our case is the special i386 nexus, substituting any
diff --git a/sys/bus/isa/isa_common.c b/sys/bus/isa/isa_common.c
index f2a349bb1c..97766735da 100644
--- a/sys/bus/isa/isa_common.c
+++ b/sys/bus/isa/isa_common.c
@@ -87,7 +87,6 @@ static int
 isa_probe(device_t dev)
 {
 	device_set_desc(dev, "ISA bus");
-	isa_init();		/* Allow machdep code to initialise */
 	return 0;
 }
 
diff --git a/sys/bus/isa/isa_common.h b/sys/bus/isa/isa_common.h
index 98e5c022e4..d47c087268 100644
--- a/sys/bus/isa/isa_common.h
+++ b/sys/bus/isa/isa_common.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/isa/isa_common.h,v 1.5 1999/09/07 08:42:47 dfr Exp $
- * $DragonFly: src/sys/bus/isa/isa_common.h,v 1.4 2005/05/24 20:58:48 dillon Exp $
  */
 
 /*
@@ -65,7 +64,6 @@ struct isa_device {
 /*
  * These functions are architecture dependant.
  */
-extern void isa_init(void);
 extern struct resource *isa_alloc_resource(device_t bus, device_t child,
 					   int type, int *rid,
 					   u_long start, u_long end,
diff --git a/sys/bus/isa/x86_64/isa.c b/sys/bus/isa/x86_64/isa.c
index 4e38377d20..26999907df 100644
--- a/sys/bus/isa/x86_64/isa.c
+++ b/sys/bus/isa/x86_64/isa.c
@@ -65,11 +65,6 @@
 #include "../isavar.h"
 #include "../isa_common.h"
 
-void
-isa_init(void)
-{
-}
-
 /*
  * This implementation simply passes the request up to the parent
  * bus, which in our case is the special i386 nexus, substituting any