Merge tag 'v4.6-rc1' into for-linus-4.6

[deliverable/linux.git] / drivers / gpio / gpio-arizona.c

diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
index e910c1f41d9340d9f02624d7549ca1ac2071b3a6..991370494922b1f7ac3489dc0616793be319378a 100644 (file)
--- a/drivers/gpio/gpio-arizona.c
+++ b/drivers/gpio/gpio-arizona.c
@@ -132,7 +132,8 @@ static int arizona_gpio_probe(struct platform_device *pdev)
        else
                arizona_gpio->gpio_chip.base = -1;
 
-       ret = gpiochip_add_data(&arizona_gpio->gpio_chip, arizona_gpio);
+       ret = devm_gpiochip_add_data(&pdev->dev, &arizona_gpio->gpio_chip,
+                                    arizona_gpio);
        if (ret < 0) {
                dev_err(&pdev->dev, "Could not register gpiochip, %d\n",
                        ret);
@@ -147,18 +148,9 @@ err:
        return ret;
 }
 
-static int arizona_gpio_remove(struct platform_device *pdev)
-{
-       struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&arizona_gpio->gpio_chip);
-       return 0;
-}
-
 static struct platform_driver arizona_gpio_driver = {
        .driver.name    = "arizona-gpio",
        .probe          = arizona_gpio_probe,
-       .remove         = arizona_gpio_remove,
 };
 
 module_platform_driver(arizona_gpio_driver);