Re: [PATCH] iio: adc: ad799x: Add a single error handling block at the end of the function.
From: Jonathan Cameron <jic23@kernel.org>
Date: 2021-09-11 17:08:04
Also in:
lkml
From: Jonathan Cameron <jic23@kernel.org>
Date: 2021-09-11 17:08:04
Also in:
lkml
On Tue, 7 Sep 2021 14:24:06 +0800 Cai Huoqing [off-list ref] wrote:
A single error handling block at the end of the function could be brought in to make code a little more concise. Signed-off-by: Cai Huoqing <redacted> --- drivers/iio/adc/ad799x.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c index 18bf8386d50a..d3dbc4c1e375 100644 --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c@@ -891,20 +891,23 @@ static int __maybe_unused ad799x_resume(struct device *dev) } ret = regulator_enable(st->vref); if (ret) { - regulator_disable(st->reg); dev_err(dev, "Unable to enable vref regulator\n"); - return ret; + goto error_disable_reg; } /* resync config */ ret = ad799x_update_config(st, st->config); - if (ret) { - regulator_disable(st->vref); - regulator_disable(st->reg); - return ret; - } + if (ret) + goto error_disable_vref; return 0; + +error_disable_vref: + regulator_disable(st->vref); +error_disable_reg: + regulator_disable(st->vref);
st->reg
+ + return ret; } static SIMPLE_DEV_PM_OPS(ad799x_pm_ops, ad799x_suspend, ad799x_resume);