diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-03-11 02:32:44 -0400 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-04-01 02:25:47 -0400 |
commit | 4ec730dc8c697d991b9ba8910cb3f8d985016bec (patch) | |
tree | 66e2a44ea4975e154bce1740ba09558cc454b093 /drivers/power | |
parent | 2cb12122b8173e535619a833d5efc65cef718239 (diff) |
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')
-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) | |||
512 | int retval = 0; | 512 | int retval = 0; |
513 | struct ds2760_device_info *di; | 513 | struct ds2760_device_info *di; |
514 | 514 | ||
515 | di = kzalloc(sizeof(*di), GFP_KERNEL); | 515 | di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL); |
516 | if (!di) { | 516 | if (!di) { |
517 | retval = -ENOMEM; | 517 | retval = -ENOMEM; |
518 | goto di_alloc_failed; | 518 | goto di_alloc_failed; |
@@ -576,7 +576,6 @@ static int ds2760_battery_probe(struct platform_device *pdev) | |||
576 | workqueue_failed: | 576 | workqueue_failed: |
577 | power_supply_unregister(&di->bat); | 577 | power_supply_unregister(&di->bat); |
578 | batt_failed: | 578 | batt_failed: |
579 | kfree(di); | ||
580 | di_alloc_failed: | 579 | di_alloc_failed: |
581 | success: | 580 | success: |
582 | return retval; | 581 | return retval; |
@@ -590,7 +589,6 @@ static int ds2760_battery_remove(struct platform_device *pdev) | |||
590 | cancel_delayed_work_sync(&di->set_charged_work); | 589 | cancel_delayed_work_sync(&di->set_charged_work); |
591 | destroy_workqueue(di->monitor_wqueue); | 590 | destroy_workqueue(di->monitor_wqueue); |
592 | power_supply_unregister(&di->bat); | 591 | power_supply_unregister(&di->bat); |
593 | kfree(di); | ||
594 | 592 | ||
595 | return 0; | 593 | return 0; |
596 | } | 594 | } |