Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

power: supply: pcf50633: 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/20240123163653.384385-11-afd@ti.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

Andrew Davis and committed by
Sebastian Reichel
e90a67f6 2abb5711

+9 -14
+9 -14
drivers/power/supply/pcf50633-charger.c
··· 404 404 psy_cfg.drv_data = mbc; 405 405 406 406 /* Create power supplies */ 407 - mbc->adapter = power_supply_register(&pdev->dev, 408 - &pcf50633_mbc_adapter_desc, 409 - &psy_cfg); 407 + mbc->adapter = devm_power_supply_register(&pdev->dev, 408 + &pcf50633_mbc_adapter_desc, 409 + &psy_cfg); 410 410 if (IS_ERR(mbc->adapter)) { 411 411 dev_err(mbc->pcf->dev, "failed to register adapter\n"); 412 412 return PTR_ERR(mbc->adapter); ··· 415 415 usb_psy_cfg = psy_cfg; 416 416 usb_psy_cfg.attr_grp = pcf50633_mbc_sysfs_groups; 417 417 418 - mbc->usb = power_supply_register(&pdev->dev, &pcf50633_mbc_usb_desc, 419 - &usb_psy_cfg); 418 + mbc->usb = devm_power_supply_register(&pdev->dev, 419 + &pcf50633_mbc_usb_desc, 420 + &usb_psy_cfg); 420 421 if (IS_ERR(mbc->usb)) { 421 422 dev_err(mbc->pcf->dev, "failed to register usb\n"); 422 - power_supply_unregister(mbc->adapter); 423 423 return PTR_ERR(mbc->usb); 424 424 } 425 425 426 - mbc->ac = power_supply_register(&pdev->dev, &pcf50633_mbc_ac_desc, 427 - &psy_cfg); 426 + mbc->ac = devm_power_supply_register(&pdev->dev, 427 + &pcf50633_mbc_ac_desc, 428 + &psy_cfg); 428 429 if (IS_ERR(mbc->ac)) { 429 430 dev_err(mbc->pcf->dev, "failed to register ac\n"); 430 - power_supply_unregister(mbc->adapter); 431 - power_supply_unregister(mbc->usb); 432 431 return PTR_ERR(mbc->ac); 433 432 } 434 433 ··· 448 449 /* Remove IRQ handlers */ 449 450 for (i = 0; i < ARRAY_SIZE(mbc_irq_handlers); i++) 450 451 pcf50633_free_irq(mbc->pcf, mbc_irq_handlers[i]); 451 - 452 - power_supply_unregister(mbc->usb); 453 - power_supply_unregister(mbc->adapter); 454 - power_supply_unregister(mbc->ac); 455 452 } 456 453 457 454 static struct platform_driver pcf50633_mbc_driver = {