diff options
author | David Brownell <david-b@pacbell.net> | 2008-02-11 21:40:46 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:35 -0400 |
commit | 135db0485cdfa808d69420889ca4a2fad8aed9df (patch) | |
tree | fd21bc5d22e1e2a083998c19004f1bc286dfde85 /drivers/usb/host/ehci-ppc-soc.c | |
parent | caa9ef672a045ba0b19184cd3f872b583f066771 (diff) |
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.c | 5 |
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) | |||
175 | if (usb_disabled()) | 175 | if (usb_disabled()) |
176 | return -ENODEV; | 176 | return -ENODEV; |
177 | 177 | ||
178 | /* FIXME we only want one one probe() not two */ | ||
178 | ret = usb_ehci_ppc_soc_probe(&ehci_ppc_soc_hc_driver, &hcd, pdev); | 179 | ret = usb_ehci_ppc_soc_probe(&ehci_ppc_soc_hc_driver, &hcd, pdev); |
179 | return ret; | 180 | return ret; |
180 | } | 181 | } |
@@ -183,17 +184,17 @@ static int ehci_hcd_ppc_soc_drv_remove(struct platform_device *pdev) | |||
183 | { | 184 | { |
184 | struct usb_hcd *hcd = platform_get_drvdata(pdev); | 185 | struct usb_hcd *hcd = platform_get_drvdata(pdev); |
185 | 186 | ||
187 | /* FIXME we only want one one remove() not two */ | ||
186 | usb_ehci_ppc_soc_remove(hcd, pdev); | 188 | usb_ehci_ppc_soc_remove(hcd, pdev); |
187 | return 0; | 189 | return 0; |
188 | } | 190 | } |
189 | 191 | ||
190 | MODULE_ALIAS("ppc-soc-ehci"); | 192 | MODULE_ALIAS("platform:ppc-soc-ehci"); |
191 | static struct platform_driver ehci_ppc_soc_driver = { | 193 | static struct platform_driver ehci_ppc_soc_driver = { |
192 | .probe = ehci_hcd_ppc_soc_drv_probe, | 194 | .probe = ehci_hcd_ppc_soc_drv_probe, |
193 | .remove = ehci_hcd_ppc_soc_drv_remove, | 195 | .remove = ehci_hcd_ppc_soc_drv_remove, |
194 | .shutdown = usb_hcd_platform_shutdown, | 196 | .shutdown = usb_hcd_platform_shutdown, |
195 | .driver = { | 197 | .driver = { |
196 | .name = "ppc-soc-ehci", | 198 | .name = "ppc-soc-ehci", |
197 | .bus = &platform_bus_type | ||
198 | } | 199 | } |
199 | }; | 200 | }; |