diff options
| author | Fuqian Huang <huangfq.daxian@gmail.com> | 2019-07-08 15:34:09 +0300 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2019-08-28 12:51:26 +0300 |
| commit | b9cd1663fb49c9432c346be742f94ef25b406c89 (patch) | |
| tree | 4e61d927a61bbcae5a3a34a339779862447555fe /drivers/thermal | |
| parent | 9aee3713135a6733f6e58ec84c1ce24514579039 (diff) | |
| download | linux-b9cd1663fb49c9432c346be742f94ef25b406c89.tar.xz | |
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>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/rcar_gen3_thermal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index a56463308694..755d2b5bd2c2 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -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; } |