Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-u300.c

diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c
index b84de03ed54d418e7d7b00176381899e02110b48..8c039ad22baf0eb44e78f2ceca9af5e3747b7644 100644 (file)
--- a/drivers/pinctrl/pinctrl-u300.c
+++ b/drivers/pinctrl/pinctrl-u300.c
@@ -1095,7 +1095,7 @@ static int __devinit u300_pmx_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit u300_pmx_remove(struct platform_device *pdev)
+static int u300_pmx_remove(struct platform_device *pdev)
 {
        struct u300_pmx *upmx = platform_get_drvdata(pdev);
 
@@ -1111,7 +1111,7 @@ static struct platform_driver u300_pmx_driver = {
                .owner = THIS_MODULE,
        },
        .probe = u300_pmx_probe,
-       .remove = __devexit_p(u300_pmx_remove),
+       .remove = u300_pmx_remove,
 };
 
 static int __init u300_pmx_init(void)