leds: lm3532: 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: 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>

diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
index 13662a4aa1f2658200fbdeeaa2d8b6118f701a7b..8c90701dc50de5eac195c877fe4fa5b7afef3185 100644 (file)
--- a/drivers/leds/leds-lm3532.c
+++ b/drivers/leds/leds-lm3532.c
@@ -542,6 +542,13 @@ static int lm3532_parse_als(struct lm3532_data *priv)
        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)
 {
        struct fwnode_handle *child = NULL;
@@ -556,6 +563,12 @@ static int lm3532_parse_node(struct lm3532_data *priv)
        if (IS_ERR(priv->enable_gpio))
                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");
        if (IS_ERR(priv->regulator))
                priv->regulator = NULL;
@@ -691,7 +704,10 @@ static int lm3532_probe(struct i2c_client *client)
                return ret;
        }
 
-       mutex_init(&drvdata->lock);
+       ret = devm_mutex_init(&client->dev, &drvdata->lock);
+       if (ret)
+               return ret;
+
        i2c_set_clientdata(client, drvdata);
 
        ret = lm3532_parse_node(drvdata);
@@ -703,16 +719,6 @@ static int lm3532_probe(struct i2c_client *client)
        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[] = {
        { .compatible = "ti,lm3532", },
        {},
@@ -727,7 +733,6 @@ MODULE_DEVICE_TABLE(i2c, lm3532_id);
 
 static struct i2c_driver lm3532_i2c_driver = {
        .probe = lm3532_probe,
-       .remove = lm3532_remove,
        .id_table = lm3532_id,
        .driver = {
                .name = LM3532_NAME,