Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4a20f57 authored by Jingoo Han's avatar Jingoo Han Committed by Anton Vorontsov
Browse files

max8997_charger: Use devm_kzalloc() 



Use devm_kzalloc() to make cleanup paths more simple.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
parent acfbf47a

drivers/power/max8997_charger.c

+3 −6
Original line number Diff line number Diff line
@@ -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;
@@ -158,13 +159,10 @@ 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)
@@ -172,7 +170,6 @@ 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;

}