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-stmpe.c

diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
index 3e1d39895ceff4206a4f12dddfbc3c674b8c57a8..770476a9da87fbc4ca3a0a64008768602db8f14d 100644 (file)
--- a/drivers/gpio/gpio-stmpe.c
+++ b/drivers/gpio/gpio-stmpe.c
@@ -307,7 +307,7 @@ static const struct irq_domain_ops stmpe_gpio_irq_simple_ops = {
        .xlate = irq_domain_xlate_twocell,
 };
 
-static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)
+static int stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)
 {
        int base = stmpe_gpio->irq_base;
 
@@ -322,7 +322,7 @@ static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)
        return 0;
 }
 
-static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
+static int stmpe_gpio_probe(struct platform_device *pdev)
 {
        struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
        struct device_node *np = pdev->dev.of_node;
@@ -401,7 +401,7 @@ out_free:
        return ret;
 }
 
-static int __devexit stmpe_gpio_remove(struct platform_device *pdev)
+static int stmpe_gpio_remove(struct platform_device *pdev)
 {
        struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev);
        struct stmpe *stmpe = stmpe_gpio->stmpe;
@@ -434,7 +434,7 @@ static struct platform_driver stmpe_gpio_driver = {
        .driver.name    = "stmpe-gpio",
        .driver.owner   = THIS_MODULE,
        .probe          = stmpe_gpio_probe,
-       .remove         = __devexit_p(stmpe_gpio_remove),
+       .remove         = stmpe_gpio_remove,
 };
 
 static int __init stmpe_gpio_init(void)