diff options
| author | Phil Reid <preid@electromag.com.au> | 2016-07-24 22:42:59 -0400 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2016-08-15 15:51:30 -0400 |
| commit | 492ff9d8f5fa6ad44288050238b7961d457a239d (patch) | |
| tree | df979bc455dda22583c20d72d7d82d46d732ea89 /drivers/power | |
| parent | d2cec82c28802da31596b395ad292cb8f132fd63 (diff) | |
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 <preid@electromag.com.au>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/sbs-battery.c | 4 |
1 files changed, 1 insertions, 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 @@ skip_gpio: | |||
| 894 | } | 894 | } |
| 895 | } | 895 | } |
| 896 | 896 | ||
| 897 | chip->power_supply = power_supply_register(&client->dev, sbs_desc, | 897 | chip->power_supply = devm_power_supply_register(&client->dev, sbs_desc, |
| 898 | &psy_cfg); | 898 | &psy_cfg); |
| 899 | if (IS_ERR(chip->power_supply)) { | 899 | if (IS_ERR(chip->power_supply)) { |
| 900 | dev_err(&client->dev, | 900 | dev_err(&client->dev, |
| @@ -926,8 +926,6 @@ static int sbs_remove(struct i2c_client *client) | |||
| 926 | if (chip->gpio_detect) | 926 | if (chip->gpio_detect) |
| 927 | gpio_free(chip->pdata->battery_detect); | 927 | gpio_free(chip->pdata->battery_detect); |
| 928 | 928 | ||
| 929 | power_supply_unregister(chip->power_supply); | ||
| 930 | |||
| 931 | cancel_delayed_work_sync(&chip->work); | 929 | cancel_delayed_work_sync(&chip->work); |
| 932 | 930 | ||
| 933 | return 0; | 931 | return 0; |
