power: supply: max8925: Use devm_power_supply_register() helper

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/20240129190246.73067-4-afd@ti.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/max8925_power.c b/drivers/power/supply/max8925_power.c
index 4a2d6894f94ee0be8f9f1431d88d6e01da88fcbc..621a006d52a96051829f764ca07984ce1aabe76d 100644 (file)
--- a/drivers/power/supply/max8925_power.c
+++ b/drivers/power/supply/max8925_power.c
@@ -507,7 +507,6 @@ static int max8925_power_probe(struct platform_device *pdev)
        struct power_supply_config psy_cfg = {}; /* Only for ac and usb */
        struct max8925_power_pdata *pdata = NULL;
        struct max8925_power_info *info;
-       int ret;
 
        pdata = max8925_power_dt_init(pdev);
        if (!pdata) {
@@ -528,25 +527,19 @@ static int max8925_power_probe(struct platform_device *pdev)
        psy_cfg.supplied_to = pdata->supplied_to;
        psy_cfg.num_supplicants = pdata->num_supplicants;
 
-       info->ac = power_supply_register(&pdev->dev, &ac_desc, &psy_cfg);
-       if (IS_ERR(info->ac)) {
-               ret = PTR_ERR(info->ac);
-               goto out;
-       }
+       info->ac = devm_power_supply_register(&pdev->dev, &ac_desc, &psy_cfg);
+       if (IS_ERR(info->ac))
+               return PTR_ERR(info->ac);
        info->ac->dev.parent = &pdev->dev;
 
-       info->usb = power_supply_register(&pdev->dev, &usb_desc, &psy_cfg);
-       if (IS_ERR(info->usb)) {
-               ret = PTR_ERR(info->usb);
-               goto out_unregister_ac;
-       }
+       info->usb = devm_power_supply_register(&pdev->dev, &usb_desc, &psy_cfg);
+       if (IS_ERR(info->usb))
+               return PTR_ERR(info->usb);
        info->usb->dev.parent = &pdev->dev;
 
-       info->battery = power_supply_register(&pdev->dev, &battery_desc, NULL);
-       if (IS_ERR(info->battery)) {
-               ret = PTR_ERR(info->battery);
-               goto out_unregister_usb;
-       }
+       info->battery = devm_power_supply_register(&pdev->dev, &battery_desc, NULL);
+       if (IS_ERR(info->battery))
+               return PTR_ERR(info->battery);
        info->battery->dev.parent = &pdev->dev;
 
        info->batt_detect = pdata->batt_detect;
@@ -558,24 +551,14 @@ static int max8925_power_probe(struct platform_device *pdev)
 
        max8925_init_charger(chip, info);
        return 0;
-out_unregister_usb:
-       power_supply_unregister(info->usb);
-out_unregister_ac:
-       power_supply_unregister(info->ac);
-out:
-       return ret;
 }
 
 static void max8925_power_remove(struct platform_device *pdev)
 {
        struct max8925_power_info *info = platform_get_drvdata(pdev);
 
-       if (info) {
-               power_supply_unregister(info->ac);
-               power_supply_unregister(info->usb);
-               power_supply_unregister(info->battery);
+       if (info)
                max8925_deinit_charger(info);
-       }
 }
 
 static struct platform_driver max8925_power_driver = {