summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-ppc-soc.c
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2008-02-11 18:40:46 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-24 21:16:35 -0700
commit135db0485cdfa808d69420889ca4a2fad8aed9df (patch)
treefd21bc5d22e1e2a083998c19004f1bc286dfde85 /drivers/usb/host/ehci-ppc-soc.c
parentcaa9ef672a045ba0b19184cd3f872b583f066771 (diff)
downloadblackbird-op-linux-135db0485cdfa808d69420889ca4a2fad8aed9df.tar.gz
blackbird-op-linux-135db0485cdfa808d69420889ca4a2fad8aed9df.zip
USB: ehci minor SOC bus glue fixes
Various minor fixes to some SOC bus glue for EHCI: - Remove a bogus copyright (by "me"!) which someone added to the FSL driver, and an irrelevant comment. - Un-break MODULE_ALIAS() directives after platform_bus hotplugging acquired a backwards-incompatible change. (Which didn't fix ANY of the in-tree drivers it prevented from hotplugging -- sigh.) - Remove some bogus assignments of platform_bus_type; that's done by the platform_bus code. - Add some FIXMEs for drivers with that pointless two-level idiom for probe() and remove() routines. ("Obfuscation" is a non-goal.) That should help avoid future bus glue which copies that idiom. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ehci-ppc-soc.c')
-rw-r--r--drivers/usb/host/ehci-ppc-soc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-ppc-soc.c b/drivers/usb/host/ehci-ppc-soc.c
index a3249078c808..6c76036783a1 100644
--- a/drivers/usb/host/ehci-ppc-soc.c
+++ b/drivers/usb/host/ehci-ppc-soc.c
@@ -175,6 +175,7 @@ static int ehci_hcd_ppc_soc_drv_probe(struct platform_device *pdev)
if (usb_disabled())
return -ENODEV;
+ /* FIXME we only want one one probe() not two */
ret = usb_ehci_ppc_soc_probe(&ehci_ppc_soc_hc_driver, &hcd, pdev);
return ret;
}
@@ -183,17 +184,17 @@ static int ehci_hcd_ppc_soc_drv_remove(struct platform_device *pdev)
{
struct usb_hcd *hcd = platform_get_drvdata(pdev);
+ /* FIXME we only want one one remove() not two */
usb_ehci_ppc_soc_remove(hcd, pdev);
return 0;
}
-MODULE_ALIAS("ppc-soc-ehci");
+MODULE_ALIAS("platform:ppc-soc-ehci");
static struct platform_driver ehci_ppc_soc_driver = {
.probe = ehci_hcd_ppc_soc_drv_probe,
.remove = ehci_hcd_ppc_soc_drv_remove,
.shutdown = usb_hcd_platform_shutdown,
.driver = {
.name = "ppc-soc-ehci",
- .bus = &platform_bus_type
}
};
OpenPOWER on IntegriCloud