mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
max8997_charger: 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>
This commit is contained in:
parent
acfbf47a90
commit
d4a20f57d3
1 changed files with 3 additions and 6 deletions
|
@ -138,7 +138,8 @@ static int max8997_battery_probe(struct platform_device *pdev)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
charger = kzalloc(sizeof(struct charger_data), GFP_KERNEL);
|
charger = devm_kzalloc(&pdev->dev, sizeof(struct charger_data),
|
||||||
|
GFP_KERNEL);
|
||||||
if (charger == NULL) {
|
if (charger == NULL) {
|
||||||
dev_err(&pdev->dev, "Cannot allocate memory.\n");
|
dev_err(&pdev->dev, "Cannot allocate memory.\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -158,13 +159,10 @@ static int max8997_battery_probe(struct platform_device *pdev)
|
||||||
ret = power_supply_register(&pdev->dev, &charger->battery);
|
ret = power_supply_register(&pdev->dev, &charger->battery);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&pdev->dev, "failed: power supply register\n");
|
dev_err(&pdev->dev, "failed: power supply register\n");
|
||||||
goto err;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
err:
|
|
||||||
kfree(charger);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int max8997_battery_remove(struct platform_device *pdev)
|
static int max8997_battery_remove(struct platform_device *pdev)
|
||||||
|
@ -172,7 +170,6 @@ static int max8997_battery_remove(struct platform_device *pdev)
|
||||||
struct charger_data *charger = platform_get_drvdata(pdev);
|
struct charger_data *charger = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
power_supply_unregister(&charger->battery);
|
power_supply_unregister(&charger->battery);
|
||||||
kfree(charger);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue