Commit fb74e4fa authored by George Stark's avatar George Stark Committed by Lee Jones

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

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: default avatarGeorge Stark <gnstark@salutedevices.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Tested-by: default avatarNikita Travkin <nikita@trvn.ru>
Link: https://lore.kernel.org/r/20240411161032.609544-3-gnstark@salutedevices.comSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent 4cd47222
...@@ -320,6 +320,11 @@ static int aw2013_probe_dt(struct aw2013 *chip) ...@@ -320,6 +320,11 @@ static int aw2013_probe_dt(struct aw2013 *chip)
return 0; return 0;
} }
static void aw2013_chip_disable_action(void *data)
{
aw2013_chip_disable(data);
}
static const struct regmap_config aw2013_regmap_config = { static const struct regmap_config aw2013_regmap_config = {
.reg_bits = 8, .reg_bits = 8,
.val_bits = 8, .val_bits = 8,
...@@ -336,7 +341,10 @@ static int aw2013_probe(struct i2c_client *client) ...@@ -336,7 +341,10 @@ static int aw2013_probe(struct i2c_client *client)
if (!chip) if (!chip)
return -ENOMEM; return -ENOMEM;
mutex_init(&chip->mutex); ret = devm_mutex_init(&client->dev, &chip->mutex);
if (ret)
return ret;
mutex_lock(&chip->mutex); mutex_lock(&chip->mutex);
chip->client = client; chip->client = client;
...@@ -384,6 +392,10 @@ static int aw2013_probe(struct i2c_client *client) ...@@ -384,6 +392,10 @@ static int aw2013_probe(struct i2c_client *client)
goto error_reg; goto error_reg;
} }
ret = devm_add_action(&client->dev, aw2013_chip_disable_action, chip);
if (ret)
goto error_reg;
ret = aw2013_probe_dt(chip); ret = aw2013_probe_dt(chip);
if (ret < 0) if (ret < 0)
goto error_reg; goto error_reg;
...@@ -406,19 +418,9 @@ static int aw2013_probe(struct i2c_client *client) ...@@ -406,19 +418,9 @@ static int aw2013_probe(struct i2c_client *client)
error: error:
mutex_unlock(&chip->mutex); mutex_unlock(&chip->mutex);
mutex_destroy(&chip->mutex);
return ret; return ret;
} }
static void aw2013_remove(struct i2c_client *client)
{
struct aw2013 *chip = i2c_get_clientdata(client);
aw2013_chip_disable(chip);
mutex_destroy(&chip->mutex);
}
static const struct of_device_id aw2013_match_table[] = { static const struct of_device_id aw2013_match_table[] = {
{ .compatible = "awinic,aw2013", }, { .compatible = "awinic,aw2013", },
{ /* sentinel */ }, { /* sentinel */ },
...@@ -432,7 +434,6 @@ static struct i2c_driver aw2013_driver = { ...@@ -432,7 +434,6 @@ static struct i2c_driver aw2013_driver = {
.of_match_table = aw2013_match_table, .of_match_table = aw2013_match_table,
}, },
.probe = aw2013_probe, .probe = aw2013_probe,
.remove = aw2013_remove,
}; };
module_i2c_driver(aw2013_driver); module_i2c_driver(aw2013_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment