2023-11-16 22:41:54

by Andrew Davis

Subject: [PATCH 1/2] leds: tca6507: Use devm_gpiochip_add_data() to simplify remove path

Use devm version of gpiochip add function to handle removal for us.

Signed-off-by: Andrew Davis <[email protected]>
---
drivers/leds/leds-tca6507.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index e190746140959..9a6af6d8b5b5d 100644
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -638,19 +638,13 @@ static int tca6507_probe_gpios(struct device *dev,
tca->gpio.direction_output = tca6507_gpio_direction_output;
tca->gpio.set = tca6507_gpio_set_value;
tca->gpio.parent = dev;
- err = gpiochip_add_data(&tca->gpio, tca);
+ err = devm_gpiochip_add_data(dev, &tca->gpio, tca);
if (err) {
tca->gpio.ngpio = 0;
return err;
}
return 0;
}
-
-static void tca6507_remove_gpio(struct tca6507_chip *tca)
-{
- if (tca->gpio.ngpio)
- gpiochip_remove(&tca->gpio);
-}
#else /* CONFIG_GPIOLIB */
static int tca6507_probe_gpios(struct device *dev,
struct tca6507_chip *tca,
@@ -658,9 +652,6 @@ static int tca6507_probe_gpios(struct device *dev,
{
return 0;
}
-static void tca6507_remove_gpio(struct tca6507_chip *tca)
-{
-}
#endif /* CONFIG_GPIOLIB */

static struct tca6507_platform_data *
@@ -793,7 +784,6 @@ static void tca6507_remove(struct i2c_client *client)
if (tca_leds[i].led_cdev.name)
led_classdev_unregister(&tca_leds[i].led_cdev);
}
- tca6507_remove_gpio(tca);
cancel_work_sync(&tca->work);
}

--
2.39.2

2023-11-23 15:10:51

by Lee Jones

Subject: Re: [PATCH 1/2] leds: tca6507: Use devm_gpiochip_add_data() to simplify remove path

On Thu, 16 Nov 2023 16:41:20 -0600, Andrew Davis wrote:
> Use devm version of gpiochip add function to handle removal for us.
>
>

Applied, thanks!

[1/2] leds: tca6507: Use devm_gpiochip_add_data() to simplify remove path
commit: 50b683a8b9884f032c3d268b8a68df799219e91b
[2/2] leds: tca6507: Use devm_led_classdev_register() to simplify remove path
commit: 612af3a44921f21c361a369899fec61698aa08e1

--
Lee Jones [李琼斯]