summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-06 13:23:45 +0900
committerAnton Vorontsov <anton@enomsg.org>2013-06-06 17:14:13 -0700
commitf70d739ada3298fd613d738c0a1c8b10cef63bdf (patch)
tree6c98e85087673b8363ab930b53f7a90d7117ca1d /drivers/power
parent8ff3fb2902dd5d3c953f907906a413b18d9d150a (diff)
downloadop-kernel-dev-f70d739ada3298fd613d738c0a1c8b10cef63bdf.zip
op-kernel-dev-f70d739ada3298fd613d738c0a1c8b10cef63bdf.tar.gz
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')
-rw-r--r--drivers/power/rx51_battery.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/power/rx51_battery.c b/drivers/power/rx51_battery.c
index cbde1d6..8a6288d 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)
di->bat.get_property = rx51_battery_get_property;
ret = power_supply_register(di->dev, &di->bat);
- if (ret) {
- platform_set_drvdata(pdev, NULL);
+ if (ret)
return ret;
- }
return 0;
}
@@ -229,7 +227,6 @@ static int rx51_battery_remove(struct platform_device *pdev)
struct rx51_device_info *di = platform_get_drvdata(pdev);
power_supply_unregister(&di->bat);
- platform_set_drvdata(pdev, NULL);
return 0;
}
OpenPOWER on IntegriCloud