Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / gpio-wm831x.c

diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c
index 98390070fb6451f667b6dcc8e8a35bbddb034004..18cb0f534b917fe4e13fdcdedce1c14d0511bd83 100644 (file)
--- a/drivers/gpio/gpio-wm831x.c
+++ b/drivers/gpio/gpio-wm831x.c
@@ -259,7 +259,8 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
        else
                wm831x_gpio->gpio_chip.base = -1;
 
-       ret = gpiochip_add_data(&wm831x_gpio->gpio_chip, wm831x_gpio);
+       ret = devm_gpiochip_add_data(&pdev->dev, &wm831x_gpio->gpio_chip,
+                                    wm831x_gpio);
        if (ret < 0) {
                dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                return ret;
@@ -270,19 +271,10 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int wm831x_gpio_remove(struct platform_device *pdev)
-{
-       struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&wm831x_gpio->gpio_chip);
-       return 0;
-}
-
 static struct platform_driver wm831x_gpio_driver = {
        .driver.name    = "wm831x-gpio",
        .driver.owner   = THIS_MODULE,
        .probe          = wm831x_gpio_probe,
-       .remove         = wm831x_gpio_remove,
 };
 
 static int __init wm831x_gpio_init(void)