Merge tag 's390-6.10-7' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-block.git] / drivers / leds / leds-aw2013.c

diff --git a/drivers/leds/leds-aw2013.c b/drivers/leds/leds-aw2013.c
index 17235a5e576aef330a4f59e0e2d3f84e1af0ff9c..6475eadcb0df94c433823dd4d2e671057e3c515e 100644 (file)
--- a/drivers/leds/leds-aw2013.c
+++ b/drivers/leds/leds-aw2013.c
@@ -320,6 +320,11 @@ static int aw2013_probe_dt(struct aw2013 *chip)
        return 0;
 }
 
+static void aw2013_chip_disable_action(void *data)
+{
+       aw2013_chip_disable(data);
+}
+
 static const struct regmap_config aw2013_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,
@@ -336,7 +341,10 @@ static int aw2013_probe(struct i2c_client *client)
        if (!chip)
                return -ENOMEM;
 
-       mutex_init(&chip->mutex);
+       ret = devm_mutex_init(&client->dev, &chip->mutex);
+       if (ret)
+               return ret;
+
        mutex_lock(&chip->mutex);
 
        chip->client = client;
@@ -384,6 +392,10 @@ static int aw2013_probe(struct i2c_client *client)
                goto error_reg;
        }
 
+       ret = devm_add_action(&client->dev, aw2013_chip_disable_action, chip);
+       if (ret)
+               goto error_reg;
+
        ret = aw2013_probe_dt(chip);
        if (ret < 0)
                goto error_reg;
@@ -406,19 +418,9 @@ error_reg:
 
 error:
        mutex_unlock(&chip->mutex);
-       mutex_destroy(&chip->mutex);
        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[] = {
        { .compatible = "awinic,aw2013", },
        { /* sentinel */ },
@@ -432,7 +434,6 @@ static struct i2c_driver aw2013_driver = {
                .of_match_table = aw2013_match_table,
        },
        .probe = aw2013_probe,
-       .remove = aw2013_remove,
 };
 
 module_i2c_driver(aw2013_driver);