diff options
| author |   Sebastian Reichel <sebastian.reichel@collabora.com> | 2018-09-29 08:01:12 +0200 |
|---|---|---|
| committer |   Sebastian Reichel <sre@kernel.org> | 2018-12-13 00:16:47 +0100 |
| commit | 63fac6cb63b06eb1ee471d7d62a1c2e8cf72bdf0 (patch) | |
| tree | 4c3e4541b641efb05594d865f1d366cfe738eb81 /drivers/power | |
| parent | power: supply: ds2781: fix race-condition in bin attribute registration (diff) | |
| download | linux-dev-63fac6cb63b06eb1ee471d7d62a1c2e8cf72bdf0.tar.xz linux-dev-63fac6cb63b06eb1ee471d7d62a1c2e8cf72bdf0.zip | |
power: supply: ds2780: switch to devm_power_supply_register
Simplify/Cleanup the driver by switching to devm_power_supply_register
and dropping the driver's remove function.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/ds2780_battery.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/ds2780_battery.c index 2354b818e3f1..5bf7c714a6ee 100644 --- a/drivers/power/supply/ds2780_battery.c +++ b/drivers/power/supply/ds2780_battery.c @@ -768,8 +768,9 @@ static int ds2780_battery_probe(struct platform_device *pdev) psy_cfg.drv_data = dev_info; psy_cfg.attr_grp = ds2780_sysfs_groups; - dev_info->bat = power_supply_register(&pdev->dev, &dev_info->bat_desc, - &psy_cfg); + dev_info->bat = devm_power_supply_register(&pdev->dev, + &dev_info->bat_desc, + &psy_cfg); if (IS_ERR(dev_info->bat)) { dev_err(dev_info->dev, "failed to register battery\n"); return PTR_ERR(dev_info->bat); @@ -778,21 +779,11 @@ static int ds2780_battery_probe(struct platform_device *pdev) return 0; } -static int ds2780_battery_remove(struct platform_device *pdev) -{ - struct ds2780_device_info *dev_info = platform_get_drvdata(pdev); - - power_supply_unregister(dev_info->bat); - - return 0; -} - static struct platform_driver ds2780_battery_driver = { .driver = { .name = "ds2780-battery", }, .probe = ds2780_battery_probe, - .remove = ds2780_battery_remove, }; module_platform_driver(ds2780_battery_driver); |