Commit b9cd1663 authored Jul 08, 2019 by Fuqian Huang Committed by Zhang Rui Aug 28, 2019

thermal: rcar_gen3_thermal: Replace devm_add_action() followed by failure...

thermal: rcar_gen3_thermal: 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 <huangfq.daxian@gmail.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>

parent 9aee3713

drivers/thermal/rcar_gen3_thermal.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -443,9 +443,8 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev)
		if (ret)
		goto error_unregister;

		ret = devm_add_action(dev, rcar_gen3_hwmon_action, zone);
		ret = devm_add_action_or_reset(dev, rcar_gen3_hwmon_action, zone);
		if (ret) {
		rcar_gen3_hwmon_action(zone);
		goto error_unregister;
		}