diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/usb/ohci.c | 8 | ||||
-rw-r--r-- | sys/dev/usb/ohci_pci.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/ohcivar.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 88ddfc7..f71778e 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1145,23 +1145,23 @@ ohci_dumpregs(ohci_softc_t *sc) Static int ohci_intr1(ohci_softc_t *); -int +void ohci_intr(void *p) { ohci_softc_t *sc = p; if (sc == NULL || sc->sc_dying) - return (0); + return; /* If we get an interrupt while polling, then just ignore it. */ if (sc->sc_bus.use_polling) { #ifdef DIAGNOSTIC printf("ohci_intr: ignored interrupt while polling\n"); #endif - return (0); + return; } - return (ohci_intr1(sc)); + ohci_intr1(sc); } Static int diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c index a119451..1afd9bc 100644 --- a/sys/dev/usb/ohci_pci.c +++ b/sys/dev/usb/ohci_pci.c @@ -295,8 +295,8 @@ ohci_pci_attach(device_t self) sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, - (driver_intr_t *) ohci_intr, sc, &sc->ih); + err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, + &sc->ih); if (err) { device_printf(self, "Could not setup irq, %d\n", err); sc->ih = NULL; diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h index cc4f922..1daf083 100644 --- a/sys/dev/usb/ohcivar.h +++ b/sys/dev/usb/ohcivar.h @@ -164,7 +164,7 @@ struct ohci_xfer { #define OXFER(xfer) ((struct ohci_xfer *)(xfer)) usbd_status ohci_init(ohci_softc_t *); -int ohci_intr(void *); +void ohci_intr(void *); int ohci_detach(ohci_softc_t *, int); #if defined(__NetBSD__) || defined(__OpenBSD__) int ohci_activate(device_ptr_t, enum devact); |