diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 10:41:41 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 10:41:41 +0300 |
| commit | 016bf20829fa00f5e64805f77b7677365151f4af (patch) | |
| tree | 5ef012a06aaa59e7ee5bbed984322f0a97c37309 /drivers/gpio/gpio-lp3943.c | |
| parent | a961f9b472de93e770d53b7340a58dbff64b4075 (diff) | |
| parent | 725e3b7d40dffa10dbe0a24ba70676a3127f79fc (diff) | |
| download | linux-016bf20829fa00f5e64805f77b7677365151f4af.tar.xz | |
Merge branch 'devm-gpiochip-add-data' into devel
Diffstat (limited to 'drivers/gpio/gpio-lp3943.c')
| -rw-r--r-- | drivers/gpio/gpio-lp3943.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpio/gpio-lp3943.c b/drivers/gpio/gpio-lp3943.c index 1c8e2ae26938..6dc6725403ec 100644 --- a/drivers/gpio/gpio-lp3943.c +++ b/drivers/gpio/gpio-lp3943.c @@ -204,15 +204,8 @@ static int lp3943_gpio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, lp3943_gpio); - return gpiochip_add_data(&lp3943_gpio->chip, lp3943_gpio); -} - -static int lp3943_gpio_remove(struct platform_device *pdev) -{ - struct lp3943_gpio *lp3943_gpio = platform_get_drvdata(pdev); - - gpiochip_remove(&lp3943_gpio->chip); - return 0; + return devm_gpiochip_add_data(&pdev->dev, &lp3943_gpio->chip, + lp3943_gpio); } static const struct of_device_id lp3943_gpio_of_match[] = { @@ -223,7 +216,6 @@ MODULE_DEVICE_TABLE(of, lp3943_gpio_of_match); static struct platform_driver lp3943_gpio_driver = { .probe = lp3943_gpio_probe, - .remove = lp3943_gpio_remove, .driver = { .name = "lp3943-gpio", .of_match_table = lp3943_gpio_of_match, |