diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-06 00:23:45 -0400 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-06-06 20:14:13 -0400 |
commit | f70d739ada3298fd613d738c0a1c8b10cef63bdf (patch) | |
tree | 6c98e85087673b8363ab930b53f7a90d7117ca1d /drivers/power/rx51_battery.c | |
parent | 8ff3fb2902dd5d3c953f907906a413b18d9d150a (diff) |
rx51_battery: Remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on
probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is
not needed to manually clear the device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power/rx51_battery.c')
-rw-r--r-- | drivers/power/rx51_battery.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/power/rx51_battery.c b/drivers/power/rx51_battery.c index cbde1d6d3228..8a6288d87056 100644 --- a/drivers/power/rx51_battery.c +++ b/drivers/power/rx51_battery.c | |||
@@ -216,10 +216,8 @@ static int rx51_battery_probe(struct platform_device *pdev) | |||
216 | di->bat.get_property = rx51_battery_get_property; | 216 | di->bat.get_property = rx51_battery_get_property; |
217 | 217 | ||
218 | ret = power_supply_register(di->dev, &di->bat); | 218 | ret = power_supply_register(di->dev, &di->bat); |
219 | if (ret) { | 219 | if (ret) |
220 | platform_set_drvdata(pdev, NULL); | ||
221 | return ret; | 220 | return ret; |
222 | } | ||
223 | 221 | ||
224 | return 0; | 222 | return 0; |
225 | } | 223 | } |
@@ -229,7 +227,6 @@ static int rx51_battery_remove(struct platform_device *pdev) | |||
229 | struct rx51_device_info *di = platform_get_drvdata(pdev); | 227 | struct rx51_device_info *di = platform_get_drvdata(pdev); |
230 | 228 | ||
231 | power_supply_unregister(&di->bat); | 229 | power_supply_unregister(&di->bat); |
232 | platform_set_drvdata(pdev, NULL); | ||
233 | 230 | ||
234 | return 0; | 231 | return 0; |
235 | } | 232 | } |