Merge tag 'xfs-for-linus-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / gpio / gpio-da9052.c

diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index f9b3247ad14b7a8ee8497c263d9c1dba84204939..e29553b7ccdb8aaad14d574e5b6fcc433e094bb5 100644 (file)
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -214,7 +214,7 @@ static int da9052_gpio_probe(struct platform_device *pdev)
        if (pdata && pdata->gpio_base)
                gpio->gp.base = pdata->gpio_base;
 
-       ret = gpiochip_add_data(&gpio->gp, gpio);
+       ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gp, gpio);
        if (ret < 0) {
                dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                return ret;
@@ -225,17 +225,8 @@ static int da9052_gpio_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int da9052_gpio_remove(struct platform_device *pdev)
-{
-       struct da9052_gpio *gpio = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&gpio->gp);
-       return 0;
-}
-
 static struct platform_driver da9052_gpio_driver = {
        .probe = da9052_gpio_probe,
-       .remove = da9052_gpio_remove,
        .driver = {
                .name   = "da9052-gpio",
        },