Skip to content

Commit

Permalink
da9052-battery: Use devm_kzalloc()
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Jingoo Han authored and Anton Vorontsov committed Apr 1, 2013
1 parent 4ec730d commit f009495
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/power/da9052-battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,8 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
int ret;
int i;

bat = kzalloc(sizeof(struct da9052_battery), GFP_KERNEL);
bat = devm_kzalloc(&pdev->dev, sizeof(struct da9052_battery),
GFP_KERNEL);
if (!bat)
return -ENOMEM;

Expand Down Expand Up @@ -635,7 +636,6 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
while (--i >= 0)
da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);

kfree(bat);
return ret;
}
static int da9052_bat_remove(struct platform_device *pdev)
Expand All @@ -647,7 +647,6 @@ static int da9052_bat_remove(struct platform_device *pdev)
da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);

power_supply_unregister(&bat->psy);
kfree(bat);

return 0;
}
Expand Down

0 comments on commit f009495

Please sign in to comment.