diff options
author | jhb <jhb@FreeBSD.org> | 2006-02-22 18:16:26 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2006-02-22 18:16:26 +0000 |
commit | 4793b3db380bcaac1d396101ed11d3b3001642e5 (patch) | |
tree | 804a52776d979b0d584c9efe815d95731c11d05d /sys/dev/ar | |
parent | 82b4c8972021decda7584eb5dce699df1de06416 (diff) | |
download | FreeBSD-src-4793b3db380bcaac1d396101ed11d3b3001642e5.zip FreeBSD-src-4793b3db380bcaac1d396101ed11d3b3001642e5.tar.gz |
- Use bus_setup_intr() and bus_teardown_intr() to register device driver
interrupt handlers rather than BUS_SETUP_INTR() and BUS_TEARDOWN_INTR().
Uses of the BUS_*() versions in the implementation of foo_intr methods
in bus drivers were not changed. Mostly this just means that some
drivers might start printing diagnostic messages like [FAST] when
appropriate as well as honoring mpsafenet=0.
- Fix two more of the ppbus drivers' identify routines to function
correctly in the mythical case of a machine with more than one ppbus.
Diffstat (limited to 'sys/dev/ar')
-rw-r--r-- | sys/dev/ar/if_ar.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c index da657dd..b29c26b 100644 --- a/sys/dev/ar/if_ar.c +++ b/sys/dev/ar/if_ar.c @@ -258,7 +258,7 @@ ar_attach(device_t device) arc_init(hc); - if(BUS_SETUP_INTR(device_get_parent(device), device, hc->res_irq, + if(bus_setup_intr(device, hc->res_irq, INTR_TYPE_NET, arintr, hc, &hc->intr_cookie) != 0) return (1); @@ -285,7 +285,7 @@ ar_attach(device_t device) #ifndef NETGRAPH ifp = SC2IFP(sc) = if_alloc(IFT_PPP); if (ifp == NULL) { - if (BUS_TEARDOWN_INTR(device_get_parent(device), device, + if (bus_teardown_intr(device, hc->res_irq, hc->intr_cookie) != 0) { printf("intr teardown failed.. continuing\n"); } @@ -351,11 +351,10 @@ ar_attach(device_t device) int ar_detach(device_t device) { - device_t parent = device_get_parent(device); struct ar_hardc *hc = device_get_softc(device); if (hc->intr_cookie != NULL) { - if (BUS_TEARDOWN_INTR(parent, device, + if (bus_teardown_intr(device, hc->res_irq, hc->intr_cookie) != 0) { printf("intr teardown failed.. continuing\n"); } |