Commit b548a27b authored by Nicolas Ferre's avatar Nicolas Ferre

USB: ohci-at91: change annotations for probe/remove functions

Add __devinit and __devexit on *_probe() and *_remove() functions
with proper modification of struct platform_driver.
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: linux-usb@vger.kernel.org
parent 5509fea5
...@@ -94,7 +94,7 @@ static void at91_stop_hc(struct platform_device *pdev) ...@@ -94,7 +94,7 @@ static void at91_stop_hc(struct platform_device *pdev)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static void usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *); static void __devexit usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *);
/* configure so an HC device and id are always provided */ /* configure so an HC device and id are always provided */
/* always called with process context; sleeping is OK */ /* 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,7 +108,7 @@ static void usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *);
* then invokes the start() method for the HCD associated with it * then invokes the start() method for the HCD associated with it
* through the hotplug entry's driver_data. * through the hotplug entry's driver_data.
*/ */
static int usb_hcd_at91_probe(const struct hc_driver *driver, static int __devinit usb_hcd_at91_probe(const struct hc_driver *driver,
struct platform_device *pdev) struct platform_device *pdev)
{ {
int retval; int retval;
...@@ -203,7 +203,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, ...@@ -203,7 +203,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
* context, "rmmod" or something similar. * context, "rmmod" or something similar.
* *
*/ */
static void usb_hcd_at91_remove(struct usb_hcd *hcd, static void __devexit usb_hcd_at91_remove(struct usb_hcd *hcd,
struct platform_device *pdev) struct platform_device *pdev)
{ {
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
...@@ -545,7 +545,7 @@ static int __devinit ohci_at91_of_init(struct platform_device *pdev) ...@@ -545,7 +545,7 @@ static int __devinit ohci_at91_of_init(struct platform_device *pdev)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) static int __devinit ohci_hcd_at91_drv_probe(struct platform_device *pdev)
{ {
struct at91_usbh_data *pdata; struct at91_usbh_data *pdata;
int i; int i;
...@@ -620,7 +620,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) ...@@ -620,7 +620,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev); return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev);
} }
static int ohci_hcd_at91_drv_remove(struct platform_device *pdev) static int __devexit ohci_hcd_at91_drv_remove(struct platform_device *pdev)
{ {
struct at91_usbh_data *pdata = pdev->dev.platform_data; struct at91_usbh_data *pdata = pdev->dev.platform_data;
int i; int i;
...@@ -696,7 +696,7 @@ MODULE_ALIAS("platform:at91_ohci"); ...@@ -696,7 +696,7 @@ MODULE_ALIAS("platform:at91_ohci");
static struct platform_driver ohci_hcd_at91_driver = { static struct platform_driver ohci_hcd_at91_driver = {
.probe = ohci_hcd_at91_drv_probe, .probe = ohci_hcd_at91_drv_probe,
.remove = ohci_hcd_at91_drv_remove, .remove = __devexit_p(ohci_hcd_at91_drv_remove),
.shutdown = usb_hcd_platform_shutdown, .shutdown = usb_hcd_platform_shutdown,
.suspend = ohci_hcd_at91_drv_suspend, .suspend = ohci_hcd_at91_drv_suspend,
.resume = ohci_hcd_at91_drv_resume, .resume = ohci_hcd_at91_drv_resume,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment