Retire isa_setup_intr() and isa_teardown_intr() and use the generic bus

versions instead.  They were never needed as bus_generic_intr() and
bus_teardown_intr() had been changed to pass the original child device up
in 42734, but the ISA bus was not converted to new-bus until 45720.

2 files changed, 2 insertions, 8 deletions

diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index 1d1a13a..9e10320 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -1071,8 +1071,8 @@ static device_method_t isa_methods[] = {
 	DEVMETHOD(bus_write_ivar,	isa_write_ivar),
 	DEVMETHOD(bus_child_detached,	isa_child_detached),
 	DEVMETHOD(bus_driver_added,	isa_driver_added),
-	DEVMETHOD(bus_setup_intr,	isa_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	isa_teardown_intr),
+	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
 	DEVMETHOD(bus_get_resource_list,isa_get_resource_list),
 	DEVMETHOD(bus_alloc_resource,	isa_alloc_resource),
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 340ad17..a6702f4 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -73,11 +73,5 @@ extern struct resource *isa_alloc_resource(device_t bus, device_t child,
 extern int isa_release_resource(device_t bus, device_t child,
     int type, int rid, struct resource *r);
 
-extern int isa_setup_intr(device_t bus, device_t child, struct resource *r,
-    int flags, driver_filter_t *filter, void (*ihand)(void *), void *arg, 
-    void **cookiep);
-extern int isa_teardown_intr(device_t bus, device_t child, struct resource *r,
-    void *cookie);
-
 extern driver_t isa_driver;
 extern devclass_t isa_devclass;