svn commit: r220942 - in stable/8/sys: dev/usb/controller mips/atheros mips/rmi

[Hans Petter Selasky]

Author: hselasky
Date: Fri Apr 22 09:43:00 2011
New Revision: 220942
URL: http://svn.freebsd.org/changeset/base/220942

Log:
  MFC r220558.
    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.
  
  Approved by:	thompsa

Modified:
  stable/8/sys/dev/usb/controller/ehci_ixp4xx.c
  stable/8/sys/dev/usb/controller/ehci_pci.c
  stable/8/sys/mips/atheros/ar71xx_ehci.c
  stable/8/sys/mips/rmi/xls_ehci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/usb/controller/ehci_ixp4xx.c
==============================================================================
--- stable/8/sys/dev/usb/controller/ehci_ixp4xx.c	Fri Apr 22 09:41:51 2011	(r220941)
+++ stable/8/sys/dev/usb/controller/ehci_ixp4xx.c	Fri Apr 22 09:43:00 2011	(r220942)
@@ -260,13 +260,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: stable/8/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/ehci_pci.c	Fri Apr 22 09:41:51 2011	(r220941)
+++ stable/8/sys/dev/usb/controller/ehci_pci.c	Fri Apr 22 09:43:00 2011	(r220942)
@@ -503,12 +503,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: stable/8/sys/mips/atheros/ar71xx_ehci.c
==============================================================================
--- stable/8/sys/mips/atheros/ar71xx_ehci.c	Fri Apr 22 09:41:51 2011	(r220941)
+++ stable/8/sys/mips/atheros/ar71xx_ehci.c	Fri Apr 22 09:43:00 2011	(r220942)
@@ -225,13 +225,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: stable/8/sys/mips/rmi/xls_ehci.c
==============================================================================
--- stable/8/sys/mips/rmi/xls_ehci.c	Fri Apr 22 09:41:51 2011	(r220941)
+++ stable/8/sys/mips/rmi/xls_ehci.c	Fri Apr 22 09:43:00 2011	(r220942)
@@ -224,13 +224,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);