Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-vx855.c

diff --git a/drivers/gpio/gpio-vx855.c b/drivers/gpio/gpio-vx855.c
index 76ebfe5ff70219ef9faea3f39c6fa614f0e8cceb..2b7252cb24275d495802b1a45c85b4ad2a84d88e 100644 (file)
--- a/drivers/gpio/gpio-vx855.c
+++ b/drivers/gpio/gpio-vx855.c
@@ -219,7 +219,7 @@ static void vx855gpio_gpio_setup(struct vx855_gpio *vg)
 }
 
 /* This platform device is ordinarily registered by the vx855 mfd driver */
-static __devinit int vx855gpio_probe(struct platform_device *pdev)
+static int vx855gpio_probe(struct platform_device *pdev)
 {
        struct resource *res_gpi;
        struct resource *res_gpo;
@@ -284,7 +284,7 @@ out_release:
        return ret;
 }
 
-static int __devexit vx855gpio_remove(struct platform_device *pdev)
+static int vx855gpio_remove(struct platform_device *pdev)
 {
        struct vx855_gpio *vg = platform_get_drvdata(pdev);
        struct resource *res;
@@ -312,7 +312,7 @@ static struct platform_driver vx855gpio_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = vx855gpio_probe,
-       .remove         = __devexit_p(vx855gpio_remove),
+       .remove         = vx855gpio_remove,
 };
 
 module_platform_driver(vx855gpio_driver);