aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sr
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2006-02-22 18:16:26 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2006-02-22 18:16:26 +0000
commit57fb5e60974fbb2770aa12b4a72114660228c236 (patch)
tree804a52776d979b0d584c9efe815d95731c11d05d /sys/dev/sr
parentf8e3eeb519c0641c05bd194209731daa2aca30b1 (diff)
Notes
Diffstat (limited to 'sys/dev/sr')
-rw-r--r--sys/dev/sr/if_sr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 0260b1255aa4..45c764e00b51 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -389,7 +389,7 @@ sr_attach(device_t device)
src_init(hc);
sr_init_sca(hc);
- if (BUS_SETUP_INTR(device_get_parent(device), device, hc->res_irq,
+ if (bus_setup_intr(device, hc->res_irq,
INTR_TYPE_NET, srintr, hc, &hc->intr_cookie) != 0)
goto errexit;
@@ -462,11 +462,10 @@ errexit:
int
sr_detach(device_t device)
{
- device_t parent = device_get_parent(device);
struct sr_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");
}