Date: Tue, 12 Apr 2011 07:49:11 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220558 - in head/sys: arm/econa dev/usb/controller mips/atheros mips/rmi Message-ID: <201104120749.p3C7nBDQ014198@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Tue Apr 12 07:49:11 2011 New Revision: 220558 URL: http://svn.freebsd.org/changeset/base/220558 Log: We don't need to call EOWRITE4(sc, EHCI_USBINTR, 0) directly from each EHCI bus driver at detach, hence ehci_detach() does exactly this since r199718. Submitted by: Luiz Otavio O Souza MFC after: 7 days Approved by: thompsa (mentor) Modified: head/sys/arm/econa/ehci_ebus.c head/sys/dev/usb/controller/ehci_ixp4xx.c head/sys/dev/usb/controller/ehci_mv.c head/sys/dev/usb/controller/ehci_pci.c head/sys/mips/atheros/ar71xx_ehci.c head/sys/mips/rmi/xls_ehci.c Modified: head/sys/arm/econa/ehci_ebus.c ============================================================================== --- head/sys/arm/econa/ehci_ebus.c Tue Apr 12 04:48:37 2011 (r220557) +++ head/sys/arm/econa/ehci_ebus.c Tue Apr 12 07:49:11 2011 (r220558) @@ -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) { Modified: head/sys/dev/usb/controller/ehci_ixp4xx.c ============================================================================== --- head/sys/dev/usb/controller/ehci_ixp4xx.c Tue Apr 12 04:48:37 2011 (r220557) +++ head/sys/dev/usb/controller/ehci_ixp4xx.c Tue Apr 12 07:49:11 2011 (r220558) @@ -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() Modified: head/sys/dev/usb/controller/ehci_mv.c ============================================================================== --- head/sys/dev/usb/controller/ehci_mv.c Tue Apr 12 04:48:37 2011 (r220557) +++ head/sys/dev/usb/controller/ehci_mv.c Tue Apr 12 07:49:11 2011 (r220558) @@ -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) { Modified: head/sys/dev/usb/controller/ehci_pci.c ============================================================================== --- head/sys/dev/usb/controller/ehci_pci.c Tue Apr 12 04:48:37 2011 (r220557) +++ head/sys/dev/usb/controller/ehci_pci.c Tue Apr 12 07:49:11 2011 (r220558) @@ -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() Modified: head/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_ehci.c Tue Apr 12 04:48:37 2011 (r220557) +++ head/sys/mips/atheros/ar71xx_ehci.c Tue Apr 12 07:49:11 2011 (r220558) @@ -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() Modified: head/sys/mips/rmi/xls_ehci.c ============================================================================== --- head/sys/mips/rmi/xls_ehci.c Tue Apr 12 04:48:37 2011 (r220557) +++ head/sys/mips/rmi/xls_ehci.c Tue Apr 12 07:49:11 2011 (r220558) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104120749.p3C7nBDQ014198>