From 492ff9d8f5fa6ad44288050238b7961d457a239d Mon Sep 17 00:00:00 2001 From: Phil Reid Date: Mon, 25 Jul 2016 10:42:59 +0800 Subject: [PATCH] power: sbs-battery: Use devm_power_supply_register Use devm_power_supply_register instead of power_supply_register. Remove call to power_supply_unregister. Signed-off-by: Phil Reid Signed-off-by: Sebastian Reichel --- drivers/power/supply/sbs-battery.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index f9012ed29f47..31f3e333b950 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -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;