Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

leds: lm3532: Use devm API to cleanup module's resources

Browse Source 
In this driver LEDs are registered using devm_led_classdev_register()
so they are automatically unregistered after module's remove() is done.
led_classdev_unregister() calls module's led_set_brightness() to turn off
the LEDs and that callback uses resources which were destroyed already
in module's remove() so use devm API instead of remove().

Signed-off-by: George Stark <gnstark@salutedevices.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20240411161032.609544-6-gnstark@salutedevices.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
George Stark 2024-04-11 19:10:29 +03:00 committed by Lee Jones
parent b5a0b81605
commit c230c03ba8
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/leds/leds-lm3532.c
View File

@ -542,6 +542,13 @@ static int lm3532_parse_als(struct lm3532_data *priv)
return ret; return ret;
} }
static void gpio_set_low_action(void *data)
{
struct lm3532_data *priv = data;
gpiod_direction_output(priv->enable_gpio, 0);
}
static int lm3532_parse_node(struct lm3532_data *priv) static int lm3532_parse_node(struct lm3532_data *priv)
{ {
struct fwnode_handle *child = NULL; struct fwnode_handle *child = NULL;
@ -556,6 +563,12 @@ static int lm3532_parse_node(struct lm3532_data *priv)
if (IS_ERR(priv->enable_gpio)) if (IS_ERR(priv->enable_gpio))
priv->enable_gpio = NULL; priv->enable_gpio = NULL;
if (priv->enable_gpio) {
ret = devm_add_action(&priv->client->dev, gpio_set_low_action, priv);
if (ret)
return ret;
}
priv->regulator = devm_regulator_get(&priv->client->dev, "vin"); priv->regulator = devm_regulator_get(&priv->client->dev, "vin");
if (IS_ERR(priv->regulator)) if (IS_ERR(priv->regulator))
priv->regulator = NULL; priv->regulator = NULL;
@ -691,7 +704,10 @@ static int lm3532_probe(struct i2c_client *client)
return ret; return ret;
} }
mutex_init(&drvdata->lock); ret = devm_mutex_init(&client->dev, &drvdata->lock);
if (ret)
return ret;
i2c_set_clientdata(client, drvdata); i2c_set_clientdata(client, drvdata);
ret = lm3532_parse_node(drvdata); ret = lm3532_parse_node(drvdata);
@ -703,16 +719,6 @@ static int lm3532_probe(struct i2c_client *client)
return ret; return ret;
} }
static void lm3532_remove(struct i2c_client *client)
{
struct lm3532_data *drvdata = i2c_get_clientdata(client);
mutex_destroy(&drvdata->lock);
if (drvdata->enable_gpio)
gpiod_direction_output(drvdata->enable_gpio, 0);
}
static const struct of_device_id of_lm3532_leds_match[] = { static const struct of_device_id of_lm3532_leds_match[] = {
{ .compatible = "ti,lm3532", }, { .compatible = "ti,lm3532", },
{}, {},
@ -727,7 +733,6 @@ MODULE_DEVICE_TABLE(i2c, lm3532_id);
static struct i2c_driver lm3532_i2c_driver = { static struct i2c_driver lm3532_i2c_driver = {
.probe = lm3532_probe, .probe = lm3532_probe,
.remove = lm3532_remove,
.id_table = lm3532_id, .id_table = lm3532_id,
.driver = { .driver = {
.name = LM3532_NAME, .name = LM3532_NAME,