Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/usb/host/ohci-ppc-soc.c

+4 −18
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
 * This file is licenced under the GPL.

 */



#include <asm/usb.h>



/* 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 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, 
	struct ohci_hcd	*ohci;

	struct resource *res;

	int irq;

	struct usb_hcd_platform_data *pd = pdev->dev.platform_data;



	pr_debug("initializing PPC-SOC USB Controller\n");
@@ -73,9 +68,6 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, 
		goto err2;

	}



	if (pd->start && (retval = pd->start(pdev)))

		goto err3;



	ohci = hcd_to_ohci(hcd);

	ohci->flags |= OHCI_BIG_ENDIAN;

	ohci_hcd_init(ohci);
@@ -85,9 +77,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, 
		return retval;



	pr_debug("Removing PPC-SOC USB Controller\n");

	if (pd && pd->stop)

		pd->stop(pdev);

 err3:



	iounmap(hcd->regs);

 err2:

	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, 
 * @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->dev.platform_data;



	usb_remove_hcd(hcd);



	pr_debug("stopping PPC-SOC USB Controller\n");

	if (pd && pd->stop)

		pd->stop(pdev);



	iounmap(hcd->regs);

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);