Skip to content

Commit

Permalink
max8997_charger: 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 acfbf47 commit d4a20f5
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/power/max8997_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ static int max8997_battery_probe(struct platform_device *pdev)
return ret;
}

charger = kzalloc(sizeof(struct charger_data), GFP_KERNEL);
charger = devm_kzalloc(&pdev->dev, sizeof(struct charger_data),
GFP_KERNEL);
if (charger == NULL) {
dev_err(&pdev->dev, "Cannot allocate memory.\n");
return -ENOMEM;
Expand All @@ -158,21 +159,17 @@ static int max8997_battery_probe(struct platform_device *pdev)
ret = power_supply_register(&pdev->dev, &charger->battery);
if (ret) {
dev_err(&pdev->dev, "failed: power supply register\n");
goto err;
return ret;
}

return 0;
err:
kfree(charger);
return ret;
}

static int max8997_battery_remove(struct platform_device *pdev)
{
struct charger_data *charger = platform_get_drvdata(pdev);

power_supply_unregister(&charger->battery);
kfree(charger);
return 0;
}

Expand Down

0 comments on commit d4a20f5

Please sign in to comment.