Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / gpio / gpio-tps6586x.c

diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c
index 62e9e1c..29e8e75 100644 (file)
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@ -88,7 +88,7 @@ static int tps6586x_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
                                TPS6586X_INT_PLDO_0 + offset);
 }
 
-static int __devinit tps6586x_gpio_probe(struct platform_device *pdev)
+static int tps6586x_gpio_probe(struct platform_device *pdev)
 {
        struct tps6586x_platform_data *pdata;
        struct tps6586x_gpio *tps6586x_gpio;
@@ -135,7 +135,7 @@ static int __devinit tps6586x_gpio_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int __devexit tps6586x_gpio_remove(struct platform_device *pdev)
+static int tps6586x_gpio_remove(struct platform_device *pdev)
 {
        struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev);
 
@@ -146,7 +146,7 @@ static struct platform_driver tps6586x_gpio_driver = {
        .driver.name    = "tps6586x-gpio",
        .driver.owner   = THIS_MODULE,
        .probe          = tps6586x_gpio_probe,
-       .remove         = __devexit_p(tps6586x_gpio_remove),
+       .remove         = tps6586x_gpio_remove,
 };
 
 static int __init tps6586x_gpio_init(void)