iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

power: supply: da9150: Use devm_power_supply_register() helper

Browse Source 
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-18-afd@ti.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Andrew Davis 2024-01-23 10:36:49 -06:00 committed by Sebastian Reichel
parent 9115c67707
commit 077c1df845
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/power/supply/da9150-charger.c
View File

@ -538,15 +538,13 @@ static int da9150_charger_probe(struct platform_device *pdev)
return PTR_ERR(charger->vbat_chan); return PTR_ERR(charger->vbat_chan);
/* Register power supplies */ /* Register power supplies */
charger->usb = power_supply_register(dev, &usb_desc, NULL); charger->usb = devm_power_supply_register(dev, &usb_desc, NULL);
if (IS_ERR(charger->usb)) if (IS_ERR(charger->usb))
return PTR_ERR(charger->usb); return PTR_ERR(charger->usb);
charger->battery = power_supply_register(dev, &battery_desc, NULL); charger->battery = devm_power_supply_register(dev, &battery_desc, NULL);
if (IS_ERR(charger->battery)) { if (IS_ERR(charger->battery))
ret = PTR_ERR(charger->battery); return PTR_ERR(charger->battery);
goto battery_fail;
}
/* Get initial online supply */ /* Get initial online supply */
reg = da9150_reg_read(da9150, DA9150_STATUS_H); reg = da9150_reg_read(da9150, DA9150_STATUS_H);
@ -606,8 +604,6 @@ tjunc_irq_fail:
chg_irq_fail: chg_irq_fail:
if (!IS_ERR_OR_NULL(charger->usb_phy)) if (!IS_ERR_OR_NULL(charger->usb_phy))
usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); usb_unregister_notifier(charger->usb_phy, &charger->otg_nb);
battery_fail:
power_supply_unregister(charger->usb);
return ret; return ret;
} }
@ -633,9 +629,6 @@ static void da9150_charger_remove(struct platform_device *pdev)
if (!IS_ERR_OR_NULL(charger->usb_phy)) if (!IS_ERR_OR_NULL(charger->usb_phy))
usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); usb_unregister_notifier(charger->usb_phy, &charger->otg_nb);
cancel_work_sync(&charger->otg_work); cancel_work_sync(&charger->otg_work);
power_supply_unregister(charger->battery);
power_supply_unregister(charger->usb);
} }
static struct platform_driver da9150_charger_driver = { static struct platform_driver da9150_charger_driver = {