Skip to content

Commit 3db3747

Browse files
whamesre
authored andcommitted
power: supply: wm97xx: Use devm_power_supply_register()
Instead of handling the registration manually, use the automatic `devres` variant `devm_power_supply_register()`. This is less error prone and cleaner. Signed-off-by: Waqar Hameed <waqar.hameed@axis.com> Link: https://patch.msgid.link/b0b366d302f0605c8555dd68ed32973959f133bb.1769158280.git.waqar.hameed@axis.com Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 72db889 commit 3db3747

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

drivers/power/supply/wm97xx_battery.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static int wm97xx_bat_probe(struct platform_device *dev)
223223
bat_psy_desc.properties = prop;
224224
bat_psy_desc.num_properties = props;
225225

226-
bat_psy = power_supply_register(&dev->dev, &bat_psy_desc, &cfg);
226+
bat_psy = devm_power_supply_register(&dev->dev, &bat_psy_desc, &cfg);
227227
if (IS_ERR(bat_psy))
228228
return PTR_ERR(bat_psy);
229229

@@ -232,27 +232,19 @@ static int wm97xx_bat_probe(struct platform_device *dev)
232232
if (charge_gpiod) {
233233
ret = request_irq(gpiod_to_irq(charge_gpiod), wm97xx_chrg_irq,
234234
0, "AC Detect", dev);
235-
if (ret) {
236-
dev_err_probe(&dev->dev, ret,
237-
"failed to request GPIO irq\n");
238-
goto unregister;
239-
}
235+
if (ret)
236+
return dev_err_probe(&dev->dev, ret,
237+
"failed to request GPIO irq\n");
240238
}
241239

242240
return 0;
243-
244-
unregister:
245-
power_supply_unregister(bat_psy);
246-
247-
return ret;
248241
}
249242

250243
static void wm97xx_bat_remove(struct platform_device *dev)
251244
{
252245
if (charge_gpiod)
253246
free_irq(gpiod_to_irq(charge_gpiod), dev);
254247
cancel_work_sync(&bat_work);
255-
power_supply_unregister(bat_psy);
256248
}
257249

258250
static struct platform_driver wm97xx_bat_driver = {

0 commit comments

Comments
 (0)