From: Sebastian Reichel Date: Sat, 29 Sep 2018 06:01:12 +0000 (+0200) Subject: power: supply: ds2780: switch to devm_power_supply_register X-Git-Tag: v5.0-rc1~101^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63fac6cb63b06eb1ee471d7d62a1c2e8cf72bdf0;p=thirdparty%2Flinux.git 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 --- diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/ds2780_battery.c index 2354b818e3f16..5bf7c714a6eea 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);