]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
power: supply: ds2780: switch to devm_power_supply_register
authorSebastian Reichel <sebastian.reichel@collabora.com>
Sat, 29 Sep 2018 06:01:12 +0000 (08:01 +0200)
committerSebastian Reichel <sre@kernel.org>
Wed, 12 Dec 2018 23:16:47 +0000 (00:16 +0100)
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>
drivers/power/supply/ds2780_battery.c

index 2354b818e3f16e2b7e67b02c2f11c84694c61b2c..5bf7c714a6eea16af60745dd7e3bfd205baabca3 100644 (file)
@@ -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);