diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2016-09-16 01:51:10 +0000 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-18 13:18:13 +0200 |
| commit | 8df759c9e66d91507b653433b14ef2216d19ee29 (patch) | |
| tree | 8f6e60e951e99e9ba3bd05edfec52224fb4c4857 /drivers/gpio | |
| parent | 7f8b96570291def5104cec6f68bae09bd55b691a (diff) | |
| download | linux-8df759c9e66d91507b653433b14ef2216d19ee29.tar.gz linux-8df759c9e66d91507b653433b14ef2216d19ee29.tar.bz2 linux-8df759c9e66d91507b653433b14ef2216d19ee29.zip | |
gpio: tps65218: 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-tps65218.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpio/gpio-tps65218.c b/drivers/gpio/gpio-tps65218.c index 03e0dfbe9720..d779307a9685 100644 --- a/drivers/gpio/gpio-tps65218.c +++ b/drivers/gpio/gpio-tps65218.c @@ -204,7 +204,8 @@ static int tps65218_gpio_probe(struct platform_device *pdev) tps65218_gpio->gpio_chip.of_node = pdev->dev.of_node; #endif - ret = gpiochip_add_data(&tps65218_gpio->gpio_chip, tps65218_gpio); + ret = devm_gpiochip_add_data(&pdev->dev, &tps65218_gpio->gpio_chip, + tps65218_gpio); if (ret < 0) { dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret); return ret; @@ -215,15 +216,6 @@ static int tps65218_gpio_probe(struct platform_device *pdev) return ret; } -static int tps65218_gpio_remove(struct platform_device *pdev) -{ - struct tps65218_gpio *tps65218_gpio = platform_get_drvdata(pdev); - - gpiochip_remove(&tps65218_gpio->gpio_chip); - - return 0; -} - static const struct of_device_id tps65218_dt_match[] = { { .compatible = "ti,tps65218-gpio" }, { } @@ -242,7 +234,6 @@ static struct platform_driver tps65218_gpio_driver = { .of_match_table = of_match_ptr(tps65218_dt_match) }, .probe = tps65218_gpio_probe, - .remove = tps65218_gpio_remove, .id_table = tps65218_gpio_id_table, }; |