LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] iio: adc: ad799x: Add a single error handling block at the end of the function.
@ 2021-09-07  6:24 Cai Huoqing
  2021-09-11 17:11 ` Jonathan Cameron
  0 siblings, 1 reply; 2+ messages in thread
From: Cai Huoqing @ 2021-09-07  6:24 UTC (permalink / raw)
  To: caihuoqing
  Cc: Lars-Peter Clausen, Michael Hennerich, Jonathan Cameron,
	linux-iio, linux-kernel

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 <caihuoqing@baidu.com>
---
 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);
+
+	return ret;
 }
 
 static SIMPLE_DEV_PM_OPS(ad799x_pm_ops, ad799x_suspend, ad799x_resume);
-- 
2.25.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] iio: adc: ad799x: Add a single error handling block at the end of the function.
  2021-09-07  6:24 [PATCH] iio: adc: ad799x: Add a single error handling block at the end of the function Cai Huoqing
@ 2021-09-11 17:11 ` Jonathan Cameron
  0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2021-09-11 17:11 UTC (permalink / raw)
  To: Cai Huoqing
  Cc: Lars-Peter Clausen, Michael Hennerich, linux-iio, linux-kernel

On Tue, 7 Sep 2021 14:24:06 +0800
Cai Huoqing <caihuoqing@baidu.com> 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 <caihuoqing@baidu.com>
> ---
>  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);


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-11 17:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-07  6:24 [PATCH] iio: adc: ad799x: Add a single error handling block at the end of the function Cai Huoqing
2021-09-11 17:11 ` Jonathan Cameron

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).