diff options
Diffstat (limited to 'drivers/usb/host/ehci-ppc-of.c')
-rw-r--r-- | drivers/usb/host/ehci-ppc-of.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c index ba52be473027..1f09f253697e 100644 --- a/drivers/usb/host/ehci-ppc-of.c +++ b/drivers/usb/host/ehci-ppc-of.c | |||
@@ -105,8 +105,7 @@ ppc44x_enable_bmt(struct device_node *dn) | |||
105 | } | 105 | } |
106 | 106 | ||
107 | 107 | ||
108 | static int __devinit | 108 | static int __devinit ehci_hcd_ppc_of_probe(struct platform_device *op) |
109 | ehci_hcd_ppc_of_probe(struct platform_device *op, const struct of_device_id *match) | ||
110 | { | 109 | { |
111 | struct device_node *dn = op->dev.of_node; | 110 | struct device_node *dn = op->dev.of_node; |
112 | struct usb_hcd *hcd; | 111 | struct usb_hcd *hcd; |
@@ -255,14 +254,12 @@ static int ehci_hcd_ppc_of_remove(struct platform_device *op) | |||
255 | } | 254 | } |
256 | 255 | ||
257 | 256 | ||
258 | static int ehci_hcd_ppc_of_shutdown(struct platform_device *op) | 257 | static void ehci_hcd_ppc_of_shutdown(struct platform_device *op) |
259 | { | 258 | { |
260 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); | 259 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); |
261 | 260 | ||
262 | if (hcd->driver->shutdown) | 261 | if (hcd->driver->shutdown) |
263 | hcd->driver->shutdown(hcd); | 262 | hcd->driver->shutdown(hcd); |
264 | |||
265 | return 0; | ||
266 | } | 263 | } |
267 | 264 | ||
268 | 265 | ||
@@ -275,7 +272,7 @@ static const struct of_device_id ehci_hcd_ppc_of_match[] = { | |||
275 | MODULE_DEVICE_TABLE(of, ehci_hcd_ppc_of_match); | 272 | MODULE_DEVICE_TABLE(of, ehci_hcd_ppc_of_match); |
276 | 273 | ||
277 | 274 | ||
278 | static struct of_platform_driver ehci_hcd_ppc_of_driver = { | 275 | static struct platform_driver ehci_hcd_ppc_of_driver = { |
279 | .probe = ehci_hcd_ppc_of_probe, | 276 | .probe = ehci_hcd_ppc_of_probe, |
280 | .remove = ehci_hcd_ppc_of_remove, | 277 | .remove = ehci_hcd_ppc_of_remove, |
281 | .shutdown = ehci_hcd_ppc_of_shutdown, | 278 | .shutdown = ehci_hcd_ppc_of_shutdown, |