From: Fuqian Huang Date: Mon, 8 Jul 2019 12:32:59 +0000 (+0800) Subject: power: supply: sc27xx: Replace devm_add_action() followed by failure action with... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=204205836f4d9a44c3e8825a9c14704fc5b2cdfd;p=linux.git 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: Fuqian Huang Reviewed-by: Baolin Wang Signed-off-by: Sebastian Reichel --- diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c index 9c184d80088bf..58b2970cd3594 100644 --- a/drivers/power/supply/sc27xx_fuel_gauge.c +++ b/drivers/power/supply/sc27xx_fuel_gauge.c @@ -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; }