power: supply: bq27xxx: Add devm action to free IDA

Use a device lifecycle managed action to free the IDA. This helps
prevent mistakes like freeing out of order in cleanup functions and
forgetting to free on error paths.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240123150914.308510-2-afd@ti.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c
index 86ce13a8ab9dddc3614c9f3522965ae680623406..019f29d13d28a670bf3102c2f53b34d886131047 100644 (file)
--- a/drivers/power/supply/bq27xxx_battery_i2c.c
+++ b/drivers/power/supply/bq27xxx_battery_i2c.c
@@ -135,28 +135,39 @@ static int bq27xxx_battery_i2c_bulk_write(struct bq27xxx_device_info *di,
        return 0;
 }
 
+static void bq27xxx_battery_i2c_devm_ida_free(void *data)
+{
+       int num = (long)data;
+
+       ida_free(&battery_id, num);
+}
+
 static int bq27xxx_battery_i2c_probe(struct i2c_client *client)
 {
        const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct bq27xxx_device_info *di;
        int ret;
        char *name;
-       int num;
+       long num;
 
        /* Get new ID for the new battery device */
        num = ida_alloc(&battery_id, GFP_KERNEL);
        if (num < 0)
                return num;
+       ret = devm_add_action_or_reset(&client->dev,
+                                      bq27xxx_battery_i2c_devm_ida_free,
+                                      (void *)num);
+       if (ret)
+               return ret;
 
-       name = devm_kasprintf(&client->dev, GFP_KERNEL, "%s-%d", id->name, num);
+       name = devm_kasprintf(&client->dev, GFP_KERNEL, "%s-%ld", id->name, num);
        if (!name)
-               goto err_mem;
+               return -ENOMEM;
 
        di = devm_kzalloc(&client->dev, sizeof(*di), GFP_KERNEL);
        if (!di)
-               goto err_mem;
+               return -ENOMEM;
 
-       di->id = num;
        di->dev = &client->dev;
        di->chip = id->driver_data;
        di->name = name;
@@ -168,7 +179,7 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client)
 
        ret = bq27xxx_battery_setup(di);
        if (ret)
-               goto err_failed;
+               return ret;
 
        /* Schedule a polling after about 1 min */
        schedule_delayed_work(&di->work, 60 * HZ);
@@ -185,19 +196,11 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client)
                                "Unable to register IRQ %d error %d\n",
                                client->irq, ret);
                        bq27xxx_battery_teardown(di);
-                       goto err_failed;
+                       return ret;
                }
        }
 
        return 0;
-
-err_mem:
-       ret = -ENOMEM;
-
-err_failed:
-       ida_free(&battery_id, num);
-
-       return ret;
 }
 
 static void bq27xxx_battery_i2c_remove(struct i2c_client *client)
@@ -206,8 +209,6 @@ static void bq27xxx_battery_i2c_remove(struct i2c_client *client)
 
        free_irq(client->irq, di);
        bq27xxx_battery_teardown(di);
-
-       ida_free(&battery_id, di->id);
 }
 
 static const struct i2c_device_id bq27xxx_i2c_id_table[] = {

diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h
index 7d8025fb74b701d6ac64cd3add0f7ca297fe5413..b9e5bd2b42d3614962e69a46170775f2974218e9 100644 (file)
--- a/include/linux/power/bq27xxx_battery.h
+++ b/include/linux/power/bq27xxx_battery.h
@@ -61,7 +61,6 @@ struct bq27xxx_reg_cache {
 
 struct bq27xxx_device_info {
        struct device *dev;
-       int id;
        enum bq27xxx_chip chip;
        u32 opts;
        const char *name;