| Message ID | 20230307165432.25484-6-afd@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/6] gpio: ich: Use devm_gpiochip_add_data() to simplify remove path | expand |
On Tue, Mar 7, 2023 at 5:54 PM Andrew Davis <afd@ti.com> wrote: > > Use devm version of gpiochip add function to handle removal for us. > > While here update copyright and module author. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > drivers/gpio/gpio-tps65086.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpio/gpio-tps65086.c b/drivers/gpio/gpio-tps65086.c > index 1e9d8262d0ff..0b8b631441ae 100644 > --- a/drivers/gpio/gpio-tps65086.c > +++ b/drivers/gpio/gpio-tps65086.c > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > /* > - * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/ > - * Andrew F. Davis <afd@ti.com> > + * Copyright (C) 2015-2023 Texas Instruments Incorporated - https://www.ti.com/ > + * Andrew Davis <afd@ti.com> > * > * Based on the TPS65912 driver > */ > @@ -86,13 +86,11 @@ static int tps65086_gpio_probe(struct platform_device *pdev) > if (!gpio) > return -ENOMEM; > > - platform_set_drvdata(pdev, gpio); > - > gpio->tps = dev_get_drvdata(pdev->dev.parent); > gpio->chip = template_chip; > gpio->chip.parent = gpio->tps->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); Drop this log and just return directly the result of devm_gpiochip_add_data() to save a couple more lines. Bart > return ret; > @@ -101,15 +99,6 @@ static int tps65086_gpio_probe(struct platform_device *pdev) > return 0; > } > > -static int tps65086_gpio_remove(struct platform_device *pdev) > -{ > - struct tps65086_gpio *gpio = platform_get_drvdata(pdev); > - > - gpiochip_remove(&gpio->chip); > - > - return 0; > -} > - > static const struct platform_device_id tps65086_gpio_id_table[] = { > { "tps65086-gpio", }, > { /* sentinel */ } > @@ -121,11 +110,10 @@ static struct platform_driver tps65086_gpio_driver = { > .name = "tps65086-gpio", > }, > .probe = tps65086_gpio_probe, > - .remove = tps65086_gpio_remove, > .id_table = tps65086_gpio_id_table, > }; > module_platform_driver(tps65086_gpio_driver); > > -MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>"); > +MODULE_AUTHOR("Andrew Davis <afd@ti.com>"); > MODULE_DESCRIPTION("TPS65086 GPIO driver"); > MODULE_LICENSE("GPL v2"); > -- > 2.39.2 >
diff --git a/drivers/gpio/gpio-tps65086.c b/drivers/gpio/gpio-tps65086.c index 1e9d8262d0ff..0b8b631441ae 100644 --- a/drivers/gpio/gpio-tps65086.c +++ b/drivers/gpio/gpio-tps65086.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/ - * Andrew F. Davis <afd@ti.com> + * Copyright (C) 2015-2023 Texas Instruments Incorporated - https://www.ti.com/ + * Andrew Davis <afd@ti.com> * * Based on the TPS65912 driver */ @@ -86,13 +86,11 @@ static int tps65086_gpio_probe(struct platform_device *pdev) if (!gpio) return -ENOMEM; - platform_set_drvdata(pdev, gpio); - gpio->tps = dev_get_drvdata(pdev->dev.parent); gpio->chip = template_chip; gpio->chip.parent = gpio->tps->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; @@ -101,15 +99,6 @@ static int tps65086_gpio_probe(struct platform_device *pdev) return 0; } -static int tps65086_gpio_remove(struct platform_device *pdev) -{ - struct tps65086_gpio *gpio = platform_get_drvdata(pdev); - - gpiochip_remove(&gpio->chip); - - return 0; -} - static const struct platform_device_id tps65086_gpio_id_table[] = { { "tps65086-gpio", }, { /* sentinel */ } @@ -121,11 +110,10 @@ static struct platform_driver tps65086_gpio_driver = { .name = "tps65086-gpio", }, .probe = tps65086_gpio_probe, - .remove = tps65086_gpio_remove, .id_table = tps65086_gpio_id_table, }; module_platform_driver(tps65086_gpio_driver); -MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>"); +MODULE_AUTHOR("Andrew Davis <afd@ti.com>"); MODULE_DESCRIPTION("TPS65086 GPIO driver"); MODULE_LICENSE("GPL v2");
Use devm version of gpiochip add function to handle removal for us. While here update copyright and module author. Signed-off-by: Andrew Davis <afd@ti.com> --- drivers/gpio/gpio-tps65086.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)