diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-03-11 15:32:44 +0900 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-31 23:25:47 -0700 |
| commit | 4ec730dc8c697d991b9ba8910cb3f8d985016bec (patch) | |
| tree | 66e2a44ea4975e154bce1740ba09558cc454b093 /drivers/power/ds2760_battery.c | |
| parent | 2cb12122b8173e535619a833d5efc65cef718239 (diff) | |
| download | blackbird-op-linux-4ec730dc8c697d991b9ba8910cb3f8d985016bec.tar.gz blackbird-op-linux-4ec730dc8c697d991b9ba8910cb3f8d985016bec.zip | |
ds2760_battery: Use devm_kzalloc()
Use devm_kzalloc() to make cleanup paths more simple.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power/ds2760_battery.c')
| -rw-r--r-- | drivers/power/ds2760_battery.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index 704e652072be..85b4e6eca0b1 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c @@ -512,7 +512,7 @@ static int ds2760_battery_probe(struct platform_device *pdev) int retval = 0; struct ds2760_device_info *di; - di = kzalloc(sizeof(*di), GFP_KERNEL); + di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL); if (!di) { retval = -ENOMEM; goto di_alloc_failed; @@ -576,7 +576,6 @@ static int ds2760_battery_probe(struct platform_device *pdev) workqueue_failed: power_supply_unregister(&di->bat); batt_failed: - kfree(di); di_alloc_failed: success: return retval; @@ -590,7 +589,6 @@ static int ds2760_battery_remove(struct platform_device *pdev) cancel_delayed_work_sync(&di->set_charged_work); destroy_workqueue(di->monitor_wqueue); power_supply_unregister(&di->bat); - kfree(di); return 0; } |
