Commit 4fbd55f0 authored by Dale Farnsworth's avatar Dale Farnsworth Committed by Greg Kroah-Hartman

[PATCH] USB: remove include of asm/usb.h in ohci-ppc-soc.c

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 <asm/usb.h>.
Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8f34c288
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
* This file is licenced under the GPL. * This file is licenced under the GPL.
*/ */
#include <asm/usb.h>
/* configure so an HC device and id are always provided */ /* configure so an HC device and id are always provided */
/* always called with process context; sleeping is OK */ /* always called with process context; sleeping is OK */
...@@ -23,9 +21,7 @@ ...@@ -23,9 +21,7 @@
* usb_hcd_ppc_soc_probe - initialize On-Chip HCDs * usb_hcd_ppc_soc_probe - initialize On-Chip HCDs
* Context: !in_interrupt() * Context: !in_interrupt()
* *
* Allocates basic resources for this USB host controller, and * Allocates basic resources for this USB host controller.
* then invokes the start() method for the HCD associated with it
* through the hotplug entry's driver_data.
* *
* Store this function in the HCD's struct pci_driver as probe(). * Store this function in the HCD's struct pci_driver as probe().
*/ */
...@@ -37,7 +33,6 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, ...@@ -37,7 +33,6 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
struct ohci_hcd *ohci; struct ohci_hcd *ohci;
struct resource *res; struct resource *res;
int irq; int irq;
struct usb_hcd_platform_data *pd = pdev->dev.platform_data;
pr_debug("initializing PPC-SOC USB Controller\n"); pr_debug("initializing PPC-SOC USB Controller\n");
...@@ -73,9 +68,6 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, ...@@ -73,9 +68,6 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
goto err2; goto err2;
} }
if (pd->start && (retval = pd->start(pdev)))
goto err3;
ohci = hcd_to_ohci(hcd); ohci = hcd_to_ohci(hcd);
ohci->flags |= OHCI_BIG_ENDIAN; ohci->flags |= OHCI_BIG_ENDIAN;
ohci_hcd_init(ohci); ohci_hcd_init(ohci);
...@@ -85,9 +77,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, ...@@ -85,9 +77,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
return retval; return retval;
pr_debug("Removing PPC-SOC USB Controller\n"); pr_debug("Removing PPC-SOC USB Controller\n");
if (pd && pd->stop)
pd->stop(pdev);
err3:
iounmap(hcd->regs); iounmap(hcd->regs);
err2: err2:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len); release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
...@@ -105,21 +95,17 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, ...@@ -105,21 +95,17 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
* @pdev: USB Host Controller being removed * @pdev: USB Host Controller being removed
* Context: !in_interrupt() * Context: !in_interrupt()
* *
* Reverses the effect of usb_hcd_ppc_soc_probe(), first invoking * Reverses the effect of usb_hcd_ppc_soc_probe().
* the HCD's stop() method. It is always called from a thread * It is always called from a thread
* context, normally "rmmod", "apmd", or something similar. * context, normally "rmmod", "apmd", or something similar.
* *
*/ */
static void usb_hcd_ppc_soc_remove(struct usb_hcd *hcd, static void usb_hcd_ppc_soc_remove(struct usb_hcd *hcd,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct usb_hcd_platform_data *pd = pdev->dev.platform_data;
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
pr_debug("stopping PPC-SOC USB Controller\n"); pr_debug("stopping PPC-SOC USB Controller\n");
if (pd && pd->stop)
pd->stop(pdev);
iounmap(hcd->regs); iounmap(hcd->regs);
release_mem_region(hcd->rsrc_start, hcd->rsrc_len); release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment