Merge tag 'staging-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[cascardo/linux.git] / drivers / gpio / gpio-adp5520.c

diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index 4fa7ff1..abf1996 100644 (file)
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -153,7 +153,7 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
                goto err;
        }
 
-       ret = gpiochip_add_data(&dev->gpio_chip, dev);
+       ret = devm_gpiochip_add_data(&pdev->dev, &dev->gpio_chip, dev);
        if (ret)
                goto err;
 
@@ -164,22 +164,11 @@ err:
        return ret;
 }
 
-static int adp5520_gpio_remove(struct platform_device *pdev)
-{
-       struct adp5520_gpio *dev;
-
-       dev = platform_get_drvdata(pdev);
-       gpiochip_remove(&dev->gpio_chip);
-
-       return 0;
-}
-
 static struct platform_driver adp5520_gpio_driver = {
        .driver = {
                .name   = "adp5520-gpio",
        },
        .probe          = adp5520_gpio_probe,
-       .remove         = adp5520_gpio_remove,
 };
 
 module_platform_driver(adp5520_gpio_driver);