summaryrefslogtreecommitdiffstats
path: root/sys/dev/ppbus
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ppbus')
-rw-r--r--sys/dev/ppbus/if_plip.c2
-rw-r--r--sys/dev/ppbus/lpt.c4
-rw-r--r--sys/dev/ppbus/ppi.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 2b71be4..2af0fd1 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -357,7 +357,7 @@ lpioctl (struct ifnet *ifp, u_long cmd, caddr_t data)
}
/* attach our interrupt handler, later detached when the bus is released */
- if ((error = BUS_SETUP_INTR(ppbus, dev, sc->res_irq,
+ if ((error = bus_setup_intr(dev, sc->res_irq,
INTR_TYPE_NET, lp_intr, dev, &ih))) {
ppb_release_bus(ppbus, dev);
return (error);
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index dec1084..6296da5 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -342,7 +342,7 @@ lpt_identify(driver_t *driver, device_t parent)
device_t dev;
- dev = device_find_child(parent, LPT_NAME, 0);
+ dev = device_find_child(parent, LPT_NAME, -1);
if (!dev)
BUS_ADD_CHILD(parent, 0, LPT_NAME, -1);
}
@@ -744,7 +744,7 @@ lptwrite(struct cdev *dev, struct uio *uio, int ioflag)
/* if interrupts are working, register the handler */
if (sc->sc_irq & LP_USE_IRQ) {
/* register our interrupt handler */
- err = BUS_SETUP_INTR(ppbus, lptdev, sc->intr_resource,
+ err = bus_setup_intr(lptdev, sc->intr_resource,
INTR_TYPE_TTY, lpt_intr, lptdev,
&sc->intr_cookie);
if (err) {
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index f689bc1..35be2db 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -135,7 +135,7 @@ ppi_identify(driver_t *driver, device_t parent)
device_t dev;
- dev = device_find_child(parent, "ppi", 0);
+ dev = device_find_child(parent, "ppi", -1);
if (!dev)
BUS_ADD_CHILD(parent, 0, "ppi", -1);
}
@@ -276,7 +276,7 @@ ppiopen(struct cdev *dev, int flags, int fmt, struct thread *td)
#ifdef PERIPH_1284
if (ppi->intr_resource) {
/* register our interrupt handler */
- BUS_SETUP_INTR(device_get_parent(ppidev), ppidev, ppi->intr_resource,
+ bus_setup_intr(ppidev, ppi->intr_resource,
INTR_TYPE_TTY, ppiintr, dev, &ppi->intr_cookie);
}
#endif /* PERIPH_1284 */
OpenPOWER on IntegriCloud