Commit 46916ded authored by Fuqian Huang's avatar Fuqian Huang Committed by Jonathan Cameron

iio: adc: sc27xx: Replace devm_add_action() followed by failure action with...

iio: adc: 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>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent a0b4ddda
...@@ -546,10 +546,9 @@ static int sc27xx_adc_probe(struct platform_device *pdev) ...@@ -546,10 +546,9 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
return -ENXIO; return -ENXIO;
} }
ret = devm_add_action(dev, sc27xx_adc_free_hwlock, ret = devm_add_action_or_reset(dev, sc27xx_adc_free_hwlock,
sc27xx_data->hwlock); sc27xx_data->hwlock);
if (ret) { if (ret) {
sc27xx_adc_free_hwlock(sc27xx_data->hwlock);
dev_err(dev, "failed to add hwspinlock action\n"); dev_err(dev, "failed to add hwspinlock action\n");
return ret; return ret;
} }
...@@ -563,9 +562,8 @@ static int sc27xx_adc_probe(struct platform_device *pdev) ...@@ -563,9 +562,8 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = devm_add_action(dev, sc27xx_adc_disable, sc27xx_data); ret = devm_add_action_or_reset(dev, sc27xx_adc_disable, sc27xx_data);
if (ret) { if (ret) {
sc27xx_adc_disable(sc27xx_data);
dev_err(dev, "failed to add ADC disable action\n"); dev_err(dev, "failed to add ADC disable action\n");
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment