Merge branch 'omap-serial' of git://git.linaro.org/people/rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / drivers / usb / c67x00 / c67x00-drv.c

diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 6f3b6e267398650724ef3d2cdf49932be82ff999..fe815ecd557eaf5ad3c2df318e731978d25db7f4 100644 (file)
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -116,7 +116,7 @@ static irqreturn_t c67x00_irq(int irq, void *__dev)
 
 /* ------------------------------------------------------------------------- */
 
-static int __devinit c67x00_drv_probe(struct platform_device *pdev)
+static int c67x00_drv_probe(struct platform_device *pdev)
 {
        struct c67x00_device *c67x00;
        struct c67x00_platform_data *pdata;
@@ -191,7 +191,7 @@ static int __devinit c67x00_drv_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int __devexit c67x00_drv_remove(struct platform_device *pdev)
+static int c67x00_drv_remove(struct platform_device *pdev)
 {
        struct c67x00_device *c67x00 = platform_get_drvdata(pdev);
        struct resource *res;
@@ -219,7 +219,7 @@ static int __devexit c67x00_drv_remove(struct platform_device *pdev)
 
 static struct platform_driver c67x00_driver = {
        .probe  = c67x00_drv_probe,
-       .remove = __devexit_p(c67x00_drv_remove),
+       .remove = c67x00_drv_remove,
        .driver = {
                .owner = THIS_MODULE,
                .name = "c67x00",