diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-03-11 02:32:18 -0400 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-04-01 02:25:49 -0400 |
commit | f0094958d9011d03e688251f8a9510e43a9323f6 (patch) | |
tree | 2926c58d0edca5fa0fa3951b2b5dbc83e19ab667 /drivers/power | |
parent | 4ec730dc8c697d991b9ba8910cb3f8d985016bec (diff) |
da9052-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/da9052-battery.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/power/da9052-battery.c b/drivers/power/da9052-battery.c index 08193feb3b08..f8f4c0f7c17d 100644 --- a/drivers/power/da9052-battery.c +++ b/drivers/power/da9052-battery.c | |||
@@ -594,7 +594,8 @@ static s32 da9052_bat_probe(struct platform_device *pdev) | |||
594 | int ret; | 594 | int ret; |
595 | int i; | 595 | int i; |
596 | 596 | ||
597 | bat = kzalloc(sizeof(struct da9052_battery), GFP_KERNEL); | 597 | bat = devm_kzalloc(&pdev->dev, sizeof(struct da9052_battery), |
598 | GFP_KERNEL); | ||
598 | if (!bat) | 599 | if (!bat) |
599 | return -ENOMEM; | 600 | return -ENOMEM; |
600 | 601 | ||
@@ -635,7 +636,6 @@ err: | |||
635 | while (--i >= 0) | 636 | while (--i >= 0) |
636 | da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat); | 637 | da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat); |
637 | 638 | ||
638 | kfree(bat); | ||
639 | return ret; | 639 | return ret; |
640 | } | 640 | } |
641 | static int da9052_bat_remove(struct platform_device *pdev) | 641 | static int da9052_bat_remove(struct platform_device *pdev) |
@@ -647,7 +647,6 @@ static int da9052_bat_remove(struct platform_device *pdev) | |||
647 | da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat); | 647 | da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat); |
648 | 648 | ||
649 | power_supply_unregister(&bat->psy); | 649 | power_supply_unregister(&bat->psy); |
650 | kfree(bat); | ||
651 | 650 | ||
652 | return 0; | 651 | return 0; |
653 | } | 652 | } |