leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

da9052-battery: Use devm_kzalloc()

Browse Source 
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>
This commit is contained in:
Jingoo Han 2013-03-11 15:32:18 +09:00 committed by Anton Vorontsov
parent 4ec730dc8c
commit f0094958d9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/power/da9052-battery.c
View File

@ -594,7 +594,8 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
int ret; int ret;
int i; int i;
bat = kzalloc(sizeof(struct da9052_battery), GFP_KERNEL); bat = devm_kzalloc(&pdev->dev, sizeof(struct da9052_battery),
GFP_KERNEL);
if (!bat) if (!bat)
return -ENOMEM; return -ENOMEM;
@ -635,7 +636,6 @@ err:
while (--i >= 0) while (--i >= 0)
da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat); da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
kfree(bat);
return ret; return ret;
} }
static int da9052_bat_remove(struct platform_device *pdev) static int da9052_bat_remove(struct platform_device *pdev)
@ -647,7 +647,6 @@ static int da9052_bat_remove(struct platform_device *pdev)
da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat); da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
power_supply_unregister(&bat->psy); power_supply_unregister(&bat->psy);
kfree(bat);
return 0; return 0;
} }