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

diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index 13107772be4ffc4e1d12d471cf5df7a65a1ab639..9df015e85ad94cdffaa3630432482eb4e8af3a9a 100644 (file)
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -370,7 +370,7 @@ static int lp_gpio_probe(struct platform_device *pdev)
        gc->can_sleep = false;
        gc->parent = dev;
 
-       ret = gpiochip_add_data(gc, lg);
+       ret = devm_gpiochip_add_data(dev, gc, lg);
        if (ret) {
                dev_err(dev, "failed adding lp-gpio chip\n");
                return ret;
@@ -439,9 +439,7 @@ MODULE_DEVICE_TABLE(acpi, lynxpoint_gpio_acpi_match);
 
 static int lp_gpio_remove(struct platform_device *pdev)
 {
-       struct lp_gpio *lg = platform_get_drvdata(pdev);
        pm_runtime_disable(&pdev->dev);
-       gpiochip_remove(&lg->chip);
        return 0;
 }