Commit 8df759c9 authored by Wei Yongjun's avatar Wei Yongjun Committed by Linus Walleij

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: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7f8b9657
...@@ -204,7 +204,8 @@ static int tps65218_gpio_probe(struct platform_device *pdev) ...@@ -204,7 +204,8 @@ static int tps65218_gpio_probe(struct platform_device *pdev)
tps65218_gpio->gpio_chip.of_node = pdev->dev.of_node; tps65218_gpio->gpio_chip.of_node = pdev->dev.of_node;
#endif #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) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret); dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret);
return ret; return ret;
...@@ -215,15 +216,6 @@ static int tps65218_gpio_probe(struct platform_device *pdev) ...@@ -215,15 +216,6 @@ static int tps65218_gpio_probe(struct platform_device *pdev)
return ret; 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[] = { static const struct of_device_id tps65218_dt_match[] = {
{ .compatible = "ti,tps65218-gpio" }, { .compatible = "ti,tps65218-gpio" },
{ } { }
...@@ -242,7 +234,6 @@ static struct platform_driver tps65218_gpio_driver = { ...@@ -242,7 +234,6 @@ static struct platform_driver tps65218_gpio_driver = {
.of_match_table = of_match_ptr(tps65218_dt_match) .of_match_table = of_match_ptr(tps65218_dt_match)
}, },
.probe = tps65218_gpio_probe, .probe = tps65218_gpio_probe,
.remove = tps65218_gpio_remove,
.id_table = tps65218_gpio_id_table, .id_table = tps65218_gpio_id_table,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment