diff options
| -rw-r--r-- | sys/dev/ieee488/pcii.c | 2 | ||||
| -rw-r--r-- | sys/dev/ieee488/tnt4882.c | 2 | ||||
| -rw-r--r-- | sys/dev/pdq/if_fpa.c | 2 | ||||
| -rw-r--r-- | sys/dev/ppbus/ppi.c | 5 | ||||
| -rw-r--r-- | sys/dev/si/si_isa.c | 2 | ||||
| -rw-r--r-- | sys/dev/si/si_pci.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/slhci_pccard.c | 2 | ||||
| -rw-r--r-- | sys/dev/wds/wd7000.c | 2 |
8 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/ieee488/pcii.c b/sys/dev/ieee488/pcii.c index 34bd32b..7e5e23e 100644 --- a/sys/dev/ieee488/pcii.c +++ b/sys/dev/ieee488/pcii.c @@ -149,7 +149,7 @@ pcii_attach(device_t dev) return (error); error = bus_setup_intr(dev, sc->res[0], - INTR_TYPE_MISC | INTR_MPSAFE, + INTR_TYPE_MISC | INTR_MPSAFE, NULL, upd7210intr, &sc->upd7210, &sc->intr_handler); if (error) { bus_release_resources(dev, pcii_res_spec, sc->res); diff --git a/sys/dev/ieee488/tnt4882.c b/sys/dev/ieee488/tnt4882.c index 4209bb3..1f21731 100644 --- a/sys/dev/ieee488/tnt4882.c +++ b/sys/dev/ieee488/tnt4882.c @@ -284,7 +284,7 @@ tnt_attach(device_t dev) return (error); error = bus_setup_intr(dev, sc->res[2], INTR_TYPE_MISC | INTR_MPSAFE, - upd7210intr, &sc->upd7210, &sc->intr_handler); + NULL, upd7210intr, &sc->upd7210, &sc->intr_handler); /* Necessary magic for MITE */ bus_write_4(sc->res[0], 0xc0, rman_get_start(sc->res[1]) | 0x80); diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c index c44409f..55d5e05 100644 --- a/sys/dev/pdq/if_fpa.c +++ b/sys/dev/pdq/if_fpa.c @@ -157,7 +157,7 @@ pdq_pci_attach(device_t dev) goto bad; } - error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, + error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, NULL, pdq_pci_ifintr, dev, &sc->irq_ih); if (error) { device_printf(dev, "Failed to setup interrupt handler.\n"); diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c index 35be2db..c6ab7a7 100644 --- a/sys/dev/ppbus/ppi.c +++ b/sys/dev/ppbus/ppi.c @@ -276,8 +276,9 @@ 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(ppidev, ppi->intr_resource, - INTR_TYPE_TTY, ppiintr, dev, &ppi->intr_cookie); + bus_setup_intr(ppidev, ppi->intr_resource, + INTR_TYPE_TTY, NULL, ppiintr, dev, + &ppi->intr_cookie); } #endif /* PERIPH_1284 */ } diff --git a/sys/dev/si/si_isa.c b/sys/dev/si/si_isa.c index 5758a83..f6d5ab6 100644 --- a/sys/dev/si/si_isa.c +++ b/sys/dev/si/si_isa.c @@ -292,7 +292,7 @@ si_isa_attach(device_t dev) } sc->sc_irq = rman_get_start(sc->sc_irq_res); error = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY, - si_intr, sc,&ih); + NULL, si_intr, sc, &ih); if (error) { device_printf(dev, "couldn't activate interrupt\n"); goto fail; diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c index baa7d0a..7aa390f 100644 --- a/sys/dev/si/si_pci.c +++ b/sys/dev/si/si_pci.c @@ -99,7 +99,7 @@ si_pci_attach(device_t dev) } sc->sc_irq = rman_get_start(sc->sc_irq_res); error = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY, - si_intr, sc, &ih); + NULL, si_intr, sc, &ih); if (error) { device_printf(dev, "could not activate interrupt\n"); goto fail; diff --git a/sys/dev/usb/slhci_pccard.c b/sys/dev/usb/slhci_pccard.c index a257409..bee73cc 100644 --- a/sys/dev/usb/slhci_pccard.c +++ b/sys/dev/usb/slhci_pccard.c @@ -130,7 +130,7 @@ slhci_pccard_attach(device_t dev) device_printf(dev, "Could not add USB device\n"); } device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, slhci_pccard_intr, sc, &sc->ih); + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, NULL, slhci_pccard_intr, sc, &sc->ih); if (error) goto out; #if 1 diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c index 209c292..8c91f75 100644 --- a/sys/dev/wds/wd7000.c +++ b/sys/dev/wds/wd7000.c @@ -542,7 +542,7 @@ wds_attach(device_t dev) if (wp->intr_r == NULL) goto bad; error = bus_setup_intr(dev, wp->intr_r, INTR_TYPE_CAM | INTR_ENTROPY, - (driver_intr_t *)wds_intr, (void *)wp, + NULL, (driver_intr_t *)wds_intr, (void *)wp, &wp->intr_cookie); if (error) goto bad; |
