summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-10 12:04:42 +0000
committerLinus Walleij <linus.walleij@linaro.org>2016-09-13 10:33:49 +0200
commit9d99c41a126124b35b69ff9737d7ba12df3eaa97 (patch)
treebd6ed2acd2ba997ccd7f4c3bfc673d2b9b07d4d9 /drivers/gpio
parent2e68023971477707962143c6d6f5c8620af1342f (diff)
downloadlinux-9d99c41a126124b35b69ff9737d7ba12df3eaa97.tar.bz2
gpio: lp873x: Use devm_gpiochip_add_data() for gpio registration
Use devm_gpiochip_add_data() for GPIO registration and remove the need of driver callback .remove. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-lp873x.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpio/gpio-lp873x.c b/drivers/gpio/gpio-lp873x.c
index f10d49da1554..2386b0f410fa 100644
--- a/drivers/gpio/gpio-lp873x.c
+++ b/drivers/gpio/gpio-lp873x.c
@@ -154,7 +154,7 @@ static int lp873x_gpio_probe(struct platform_device *pdev)
gpio->chip = template_chip;
gpio->chip.parent = gpio->lp873->dev;
- ret = gpiochip_add_data(&gpio->chip, gpio);
+ ret = devm_gpiochip_add_data(&pdev->dev, &gpio->chip, gpio);
if (ret < 0) {
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
return ret;
@@ -163,15 +163,6 @@ static int lp873x_gpio_probe(struct platform_device *pdev)
return 0;
}
-static int lp873x_gpio_remove(struct platform_device *pdev)
-{
- struct lp873x_gpio *gpio = platform_get_drvdata(pdev);
-
- gpiochip_remove(&gpio->chip);
-
- return 0;
-}
-
static const struct platform_device_id lp873x_gpio_id_table[] = {
{ "lp873x-gpio", },
{ /* sentinel */ }
@@ -183,7 +174,6 @@ static struct platform_driver lp873x_gpio_driver = {
.name = "lp873x-gpio",
},
.probe = lp873x_gpio_probe,
- .remove = lp873x_gpio_remove,
.id_table = lp873x_gpio_id_table,
};
module_platform_driver(lp873x_gpio_driver);