Message ID | 1473509082-3996-1-git-send-email-weiyj.lk@gmail.com |
---|---|
State | New |
Headers | show |
On Sat, Sep 10, 2016 at 2:04 PM, Wei Yongjun <weiyj.lk@gmail.com> wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > Use devm_gpiochip_add_data() for GPIO registration and remove the need > of driver callback .remove. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/gpio/gpio-lp873x.c | 12 +----------- This patch is in Lee's MFD tree, either send it to him so he can merge it or defer to after the merge window and I can take it. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> (Yeah I know I can also pull in Lee's immutable branch, just want to avoid the complexity.) Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Sep 13, 2016 at 10:27 AM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Sat, Sep 10, 2016 at 2:04 PM, Wei Yongjun <weiyj.lk@gmail.com> wrote: > >> From: Wei Yongjun <weiyongjun1@huawei.com> >> >> Use devm_gpiochip_add_data() for GPIO registration and remove the need >> of driver callback .remove. >> >> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> >> --- >> drivers/gpio/gpio-lp873x.c | 12 +----------- > > This patch is in Lee's MFD tree, either send it to him so he can merge it > or defer to after the merge window and I can take it. > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > (Yeah I know I can also pull in Lee's immutable branch, just > want to avoid the complexity.) Changed my mind: pulled in Lee's immutable branch and applied this on top. Much better idea. Thanks both Wei and Lee. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 13 Sep 2016, Linus Walleij wrote: > On Tue, Sep 13, 2016 at 10:27 AM, Linus Walleij > <linus.walleij@linaro.org> wrote: > > On Sat, Sep 10, 2016 at 2:04 PM, Wei Yongjun <weiyj.lk@gmail.com> wrote: > > > >> From: Wei Yongjun <weiyongjun1@huawei.com> > >> > >> Use devm_gpiochip_add_data() for GPIO registration and remove the need > >> of driver callback .remove. > >> > >> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > >> --- > >> drivers/gpio/gpio-lp873x.c | 12 +----------- > > > > This patch is in Lee's MFD tree, either send it to him so he can merge it > > or defer to after the merge window and I can take it. > > > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > > > (Yeah I know I can also pull in Lee's immutable branch, just > > want to avoid the complexity.) > > Changed my mind: pulled in Lee's immutable branch and applied > this on top. Much better idea. Thanks both Wei and Lee. :)
diff --git a/drivers/gpio/gpio-lp873x.c b/drivers/gpio/gpio-lp873x.c index f10d49d..2386b0f 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);