power: supply: ds2760: Use devm_power_supply_register() helper
authorAndrew Davis <afd@ti.com>
Tue, 23 Jan 2024 16:36:35 +0000 (10:36 -0600)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Sat, 27 Jan 2024 00:23:40 +0000 (01:23 +0100)
Use the device lifecycle managed register function. This helps prevent
mistakes like unregistering out of order in cleanup functions and
forgetting to unregister on error paths.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240123163653.384385-4-afd@ti.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/ds2760_battery.c

index 40fba31be1744fb0f38ee4659f4797c1275c653d..7cf4ea06b5003427ac9719043c9a5a4361cb5341 100644 (file)
@@ -739,7 +739,7 @@ static int w1_ds2760_add_slave(struct w1_slave *sl)
        if (current_accum)
                ds2760_battery_set_current_accum(di, current_accum);
 
-       di->bat = power_supply_register(dev, &di->bat_desc, &psy_cfg);
+       di->bat = devm_power_supply_register(dev, &di->bat_desc, &psy_cfg);
        if (IS_ERR(di->bat)) {
                dev_err(di->dev, "failed to register battery\n");
                retval = PTR_ERR(di->bat);
@@ -762,7 +762,6 @@ static int w1_ds2760_add_slave(struct w1_slave *sl)
        goto success;
 
 workqueue_failed:
-       power_supply_unregister(di->bat);
 batt_failed:
 di_alloc_failed:
 success:
@@ -777,7 +776,6 @@ static void w1_ds2760_remove_slave(struct w1_slave *sl)
        cancel_delayed_work_sync(&di->monitor_work);
        cancel_delayed_work_sync(&di->set_charged_work);
        destroy_workqueue(di->monitor_wqueue);
-       power_supply_unregister(di->bat);
 }
 
 #ifdef CONFIG_OF