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

index c81cc14e7acb22605d5cd8bb13668562168dd779..166a8bd588112a1faa7d64215260e753bf53d932 100644 (file)
@@ -772,8 +772,9 @@ static int ds2781_battery_probe(struct platform_device *pdev)
        psy_cfg.drv_data                = dev_info;
        psy_cfg.attr_grp                = ds2781_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);
@@ -782,21 +783,11 @@ static int ds2781_battery_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int ds2781_battery_remove(struct platform_device *pdev)
-{
-       struct ds2781_device_info *dev_info = platform_get_drvdata(pdev);
-
-       power_supply_unregister(dev_info->bat);
-
-       return 0;
-}
-
 static struct platform_driver ds2781_battery_driver = {
        .driver = {
                .name = "ds2781-battery",
        },
        .probe    = ds2781_battery_probe,
-       .remove   = ds2781_battery_remove,
 };
 module_platform_driver(ds2781_battery_driver);