]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
power: sbs-battery: Use devm_power_supply_register
authorPhil Reid <preid@electromag.com.au>
Mon, 25 Jul 2016 02:42:59 +0000 (10:42 +0800)
committerSebastian Reichel <sre@kernel.org>
Mon, 15 Aug 2016 19:51:30 +0000 (21:51 +0200)
Use devm_power_supply_register instead of power_supply_register.
Remove call to power_supply_unregister.

Signed-off-by: Phil Reid <preid@electromag.com.au>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/supply/sbs-battery.c

index f9012ed29f471a71e7d9be9dfcd4ec29eedfdcfe..31f3e333b9501ff766fa56d60d849358f46429c2 100644 (file)
@@ -894,7 +894,7 @@ static int sbs_probe(struct i2c_client *client,
                }
        }
 
-       chip->power_supply = power_supply_register(&client->dev, sbs_desc,
+       chip->power_supply = devm_power_supply_register(&client->dev, sbs_desc,
                                                   &psy_cfg);
        if (IS_ERR(chip->power_supply)) {
                dev_err(&client->dev,
@@ -926,8 +926,6 @@ static int sbs_remove(struct i2c_client *client)
        if (chip->gpio_detect)
                gpio_free(chip->pdata->battery_detect);
 
-       power_supply_unregister(chip->power_supply);
-
        cancel_delayed_work_sync(&chip->work);
 
        return 0;