<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From dale@farnsworth.org Wed Aug 10 18:20:58 2005
From: "Dale Farnsworth" &lt;dale@farnsworth.org&gt;
Date: Wed, 10 Aug 2005 17:25:25 -0700
To: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;
Subject: USB: remove include of asm/usb.h in ohci-ppc-soc.c
Message-ID: &lt;20050811002525.GA10975@xyzzy.farnsworth.org&gt;

ohci-ppc-soc.c provides for a platform-specific callback mechanism for
when the HC is successfully probed or removed.  It turned out that none
of the 3 platforms using it need this facility. Also the required
include/asm-ppc/usb.h has never been accepted.  This patch removes the
callback feature and the include of &lt;asm/usb.h&gt;.

Signed-off-by: Dale Farnsworth &lt;dale@farnsworth.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;

---
 drivers/usb/host/ohci-ppc-soc.c |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

--- gregkh-2.6.orig/drivers/usb/host/ohci-ppc-soc.c	2005-08-15 17:50:07.000000000 -0700
+++ gregkh-2.6/drivers/usb/host/ohci-ppc-soc.c	2005-08-15 17:50:17.000000000 -0700
@@ -14,8 +14,6 @@
  * This file is licenced under the GPL.
  */
 
-#include &lt;asm/usb.h&gt;
-
 /* configure so an HC device and id are always provided */
 /* always called with process context; sleeping is OK */
 
@@ -23,9 +21,7 @@
  * usb_hcd_ppc_soc_probe - initialize On-Chip HCDs
  * Context: !in_interrupt()
  *
- * Allocates basic resources for this USB host controller, and
- * then invokes the start() method for the HCD associated with it
- * through the hotplug entry's driver_data.
+ * Allocates basic resources for this USB host controller.
  *
  * Store this function in the HCD's struct pci_driver as probe().
  */
@@ -37,7 +33,6 @@
 	struct ohci_hcd	*ohci;
 	struct resource *res;
 	int irq;
-	struct usb_hcd_platform_data *pd = pdev-&gt;dev.platform_data;
 
 	pr_debug("initializing PPC-SOC USB Controller\n");
 
@@ -73,9 +68,6 @@
 		goto err2;
 	}
 
-	if (pd-&gt;start &amp;&amp; (retval = pd-&gt;start(pdev)))
-		goto err3;
-
 	ohci = hcd_to_ohci(hcd);
 	ohci-&gt;flags |= OHCI_BIG_ENDIAN;
 	ohci_hcd_init(ohci);
@@ -85,9 +77,7 @@
 		return retval;
 
 	pr_debug("Removing PPC-SOC USB Controller\n");
-	if (pd &amp;&amp; pd-&gt;stop)
-		pd-&gt;stop(pdev);
- err3:
+
 	iounmap(hcd-&gt;regs);
  err2:
 	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);
@@ -105,21 +95,17 @@
  * @pdev: USB Host Controller being removed
  * Context: !in_interrupt()
  *
- * Reverses the effect of usb_hcd_ppc_soc_probe(), first invoking
- * the HCD's stop() method.  It is always called from a thread
+ * Reverses the effect of usb_hcd_ppc_soc_probe().
+ * It is always called from a thread
  * context, normally "rmmod", "apmd", or something similar.
  *
  */
 static void usb_hcd_ppc_soc_remove(struct usb_hcd *hcd,
 		struct platform_device *pdev)
 {
-	struct usb_hcd_platform_data *pd = pdev-&gt;dev.platform_data;
-
 	usb_remove_hcd(hcd);
 
 	pr_debug("stopping PPC-SOC USB Controller\n");
-	if (pd &amp;&amp; pd-&gt;stop)
-		pd-&gt;stop(pdev);
 
 	iounmap(hcd-&gt;regs);
 	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);
</pre></body></html>