diff options
author | Wei Yongjun <weiyongjun1@huawei.com> | 2016-09-10 08:04:42 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-13 04:33:49 -0400 |
commit | 9d99c41a126124b35b69ff9737d7ba12df3eaa97 (patch) | |
tree | bd6ed2acd2ba997ccd7f4c3bfc673d2b9b07d4d9 | |
parent | 2e68023971477707962143c6d6f5c8620af1342f (diff) |
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>
-rw-r--r-- | drivers/gpio/gpio-lp873x.c | 12 |
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) | |||
154 | gpio->chip = template_chip; | 154 | gpio->chip = template_chip; |
155 | gpio->chip.parent = gpio->lp873->dev; | 155 | gpio->chip.parent = gpio->lp873->dev; |
156 | 156 | ||
157 | ret = gpiochip_add_data(&gpio->chip, gpio); | 157 | ret = devm_gpiochip_add_data(&pdev->dev, &gpio->chip, gpio); |
158 | if (ret < 0) { | 158 | if (ret < 0) { |
159 | dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); | 159 | dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); |
160 | return ret; | 160 | return ret; |
@@ -163,15 +163,6 @@ static int lp873x_gpio_probe(struct platform_device *pdev) | |||
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||
166 | static int lp873x_gpio_remove(struct platform_device *pdev) | ||
167 | { | ||
168 | struct lp873x_gpio *gpio = platform_get_drvdata(pdev); | ||
169 | |||
170 | gpiochip_remove(&gpio->chip); | ||
171 | |||
172 | return 0; | ||
173 | } | ||
174 | |||
175 | static const struct platform_device_id lp873x_gpio_id_table[] = { | 166 | static const struct platform_device_id lp873x_gpio_id_table[] = { |
176 | { "lp873x-gpio", }, | 167 | { "lp873x-gpio", }, |
177 | { /* sentinel */ } | 168 | { /* sentinel */ } |
@@ -183,7 +174,6 @@ static struct platform_driver lp873x_gpio_driver = { | |||
183 | .name = "lp873x-gpio", | 174 | .name = "lp873x-gpio", |
184 | }, | 175 | }, |
185 | .probe = lp873x_gpio_probe, | 176 | .probe = lp873x_gpio_probe, |
186 | .remove = lp873x_gpio_remove, | ||
187 | .id_table = lp873x_gpio_id_table, | 177 | .id_table = lp873x_gpio_id_table, |
188 | }; | 178 | }; |
189 | module_platform_driver(lp873x_gpio_driver); | 179 | module_platform_driver(lp873x_gpio_driver); |