diff options
| -rw-r--r-- | sys/arm/econa/ehci_ebus.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_ixp4xx.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_mv.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_pci.c | 6 | ||||
| -rw-r--r-- | sys/mips/atheros/ar71xx_ehci.c | 7 | ||||
| -rw-r--r-- | sys/mips/rmi/xls_ehci.c | 7 |
6 files changed, 3 insertions, 31 deletions
diff --git a/sys/arm/econa/ehci_ebus.c b/sys/arm/econa/ehci_ebus.c index 86180c3..8d5bed2 100644 --- a/sys/arm/econa/ehci_ebus.c +++ b/sys/arm/econa/ehci_ebus.c @@ -238,10 +238,10 @@ ehci_ebus_detach(device_t self) device_delete_all_children(self); /* - * disable interrupts that might have been switched on in ehci_init + * disable interrupts that might have been switched on in + * ehci_ebus_attach() */ if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); EWRITE4(sc, USB_BRIDGE_INTR_MASK, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c index 79e1ccc..8ea133f 100644 --- a/sys/dev/usb/controller/ehci_ixp4xx.c +++ b/sys/dev/usb/controller/ehci_ixp4xx.c @@ -259,13 +259,6 @@ ehci_ixp_detach(device_t self) /* during module unload there are lots of children leftover */ device_delete_all_children(self); - /* - * disable interrupts that might have been switched on in ehci_init - */ - if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); - } - if (sc->sc_irq_res && sc->sc_intr_hdl) { /* * only call ehci_detach() after ehci_init() diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index 2459ab9..bbfb6a7 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -292,10 +292,9 @@ mv_ehci_detach(device_t self) device_delete_all_children(self); /* - * disable interrupts that might have been switched on in ehci_init + * disable interrupts that might have been switched on in mv_ehci_attach */ if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); EWRITE4(sc, USB_BRIDGE_INTR_MASK, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index bd160e4..6abb193 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -502,12 +502,6 @@ ehci_pci_detach(device_t self) pci_disable_busmaster(self); - /* - * disable interrupts that might have been switched on in ehci_init - */ - if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); - } if (sc->sc_irq_res && sc->sc_intr_hdl) { /* * only call ehci_detach() after ehci_init() diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c index 42e750a..9f5b894 100644 --- a/sys/mips/atheros/ar71xx_ehci.c +++ b/sys/mips/atheros/ar71xx_ehci.c @@ -246,13 +246,6 @@ ar71xx_ehci_detach(device_t self) /* during module unload there are lots of children leftover */ device_delete_all_children(self); - /* - * disable interrupts that might have been switched on in ehci_init - */ - if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); - } - if (sc->sc_irq_res && sc->sc_intr_hdl) { /* * only call ehci_detach() after ehci_init() diff --git a/sys/mips/rmi/xls_ehci.c b/sys/mips/rmi/xls_ehci.c index 0fc9a32..5c7a536 100644 --- a/sys/mips/rmi/xls_ehci.c +++ b/sys/mips/rmi/xls_ehci.c @@ -216,13 +216,6 @@ ehci_xls_detach(device_t self) /* during module unload there are lots of children leftover */ device_delete_all_children(self); - /* - * disable interrupts that might have been switched on in ehci_init - */ - if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); - } - if (sc->sc_irq_res && sc->sc_intr_hdl) { ehci_detach(sc); |
