diff options
| -rw-r--r-- | drivers/usb/host/ohci-at91.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 09f597ad6e00..13ebeca8e73e 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
| @@ -94,7 +94,7 @@ static void at91_stop_hc(struct platform_device *pdev) | |||
| 94 | 94 | ||
| 95 | /*-------------------------------------------------------------------------*/ | 95 | /*-------------------------------------------------------------------------*/ |
| 96 | 96 | ||
| 97 | static void usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *); | 97 | static void __devexit usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *); |
| 98 | 98 | ||
| 99 | /* configure so an HC device and id are always provided */ | 99 | /* configure so an HC device and id are always provided */ |
| 100 | /* always called with process context; sleeping is OK */ | 100 | /* always called with process context; sleeping is OK */ |
| @@ -108,7 +108,7 @@ static void usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *); | |||
| 108 | * then invokes the start() method for the HCD associated with it | 108 | * then invokes the start() method for the HCD associated with it |
| 109 | * through the hotplug entry's driver_data. | 109 | * through the hotplug entry's driver_data. |
| 110 | */ | 110 | */ |
| 111 | static int usb_hcd_at91_probe(const struct hc_driver *driver, | 111 | static int __devinit usb_hcd_at91_probe(const struct hc_driver *driver, |
| 112 | struct platform_device *pdev) | 112 | struct platform_device *pdev) |
| 113 | { | 113 | { |
| 114 | int retval; | 114 | int retval; |
| @@ -203,7 +203,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, | |||
| 203 | * context, "rmmod" or something similar. | 203 | * context, "rmmod" or something similar. |
| 204 | * | 204 | * |
| 205 | */ | 205 | */ |
| 206 | static void usb_hcd_at91_remove(struct usb_hcd *hcd, | 206 | static void __devexit usb_hcd_at91_remove(struct usb_hcd *hcd, |
| 207 | struct platform_device *pdev) | 207 | struct platform_device *pdev) |
| 208 | { | 208 | { |
| 209 | usb_remove_hcd(hcd); | 209 | usb_remove_hcd(hcd); |
| @@ -545,7 +545,7 @@ static int __devinit ohci_at91_of_init(struct platform_device *pdev) | |||
| 545 | 545 | ||
| 546 | /*-------------------------------------------------------------------------*/ | 546 | /*-------------------------------------------------------------------------*/ |
| 547 | 547 | ||
| 548 | static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) | 548 | static int __devinit ohci_hcd_at91_drv_probe(struct platform_device *pdev) |
| 549 | { | 549 | { |
| 550 | struct at91_usbh_data *pdata; | 550 | struct at91_usbh_data *pdata; |
| 551 | int i; | 551 | int i; |
| @@ -620,7 +620,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) | |||
| 620 | return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev); | 620 | return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev); |
| 621 | } | 621 | } |
| 622 | 622 | ||
| 623 | static int ohci_hcd_at91_drv_remove(struct platform_device *pdev) | 623 | static int __devexit ohci_hcd_at91_drv_remove(struct platform_device *pdev) |
| 624 | { | 624 | { |
| 625 | struct at91_usbh_data *pdata = pdev->dev.platform_data; | 625 | struct at91_usbh_data *pdata = pdev->dev.platform_data; |
| 626 | int i; | 626 | int i; |
| @@ -696,7 +696,7 @@ MODULE_ALIAS("platform:at91_ohci"); | |||
| 696 | 696 | ||
| 697 | static struct platform_driver ohci_hcd_at91_driver = { | 697 | static struct platform_driver ohci_hcd_at91_driver = { |
| 698 | .probe = ohci_hcd_at91_drv_probe, | 698 | .probe = ohci_hcd_at91_drv_probe, |
| 699 | .remove = ohci_hcd_at91_drv_remove, | 699 | .remove = __devexit_p(ohci_hcd_at91_drv_remove), |
| 700 | .shutdown = usb_hcd_platform_shutdown, | 700 | .shutdown = usb_hcd_platform_shutdown, |
| 701 | .suspend = ohci_hcd_at91_drv_suspend, | 701 | .suspend = ohci_hcd_at91_drv_suspend, |
| 702 | .resume = ohci_hcd_at91_drv_resume, | 702 | .resume = ohci_hcd_at91_drv_resume, |
