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 / gpio / gpio-tc3589x.c

diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 8c8447c7d2a8167bc2a9e6168e29f4a3151b29dd..c0595bbf3268d4bd8fff5dc5118e721c769c064d 100644 (file)
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -309,7 +309,7 @@ static int tc3589x_gpio_irq_init(struct tc3589x_gpio *tc3589x_gpio,
        return 0;
 }
 
-static int __devinit tc3589x_gpio_probe(struct platform_device *pdev)
+static int tc3589x_gpio_probe(struct platform_device *pdev)
 {
        struct tc3589x *tc3589x = dev_get_drvdata(pdev->dev.parent);
        struct tc3589x_gpio_platform_data *pdata;
@@ -387,7 +387,7 @@ out_free:
        return ret;
 }
 
-static int __devexit tc3589x_gpio_remove(struct platform_device *pdev)
+static int tc3589x_gpio_remove(struct platform_device *pdev)
 {
        struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);
        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
@@ -417,7 +417,7 @@ static struct platform_driver tc3589x_gpio_driver = {
        .driver.name    = "tc3589x-gpio",
        .driver.owner   = THIS_MODULE,
        .probe          = tc3589x_gpio_probe,
-       .remove         = __devexit_p(tc3589x_gpio_remove),
+       .remove         = tc3589x_gpio_remove,
 };
 
 static int __init tc3589x_gpio_init(void)