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

Commit 20420583 authored by Fuqian Huang's avatar Fuqian Huang Committed by Sebastian Reichel
Browse files

power: supply: sc27xx: Replace devm_add_action() followed by failure action... 


power: supply: sc27xx: Replace devm_add_action() followed by failure action with devm_add_action_or_reset()

devm_add_action_or_reset() is introduced as a helper function which
internally calls devm_add_action(). If devm_add_action() fails
then it will execute the action mentioned and return the error code.
This reduce source code size (avoid writing the action twice)
and reduce the likelyhood of bugs.

Signed-off-by: default avatarFuqian Huang <huangfq.daxian@gmail.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 08614b40

drivers/power/supply/sc27xx_fuel_gauge.c

+1 −2
Original line number Diff line number Diff line
@@ -1023,9 +1023,8 @@ static int sc27xx_fgu_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = devm_add_action(dev, sc27xx_fgu_disable, data);

	ret = devm_add_action_or_reset(dev, sc27xx_fgu_disable, data);

	if (ret) {

		sc27xx_fgu_disable(data);

		dev_err(dev, "failed to add fgu disable action\n");

		return ret;

	}