From: Cai Huoqing <caihuoqing@baidu.com>
To: <lars@metafoo.de>, <Michael.Hennerich@analog.com>, <jic23@kernel.org>
Cc: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Cai Huoqing <caihuoqing@baidu.com>
Subject: [PATCH v2] iio: adc: ad799x: Add a single error handling block at the end of the function.
Date: Sun, 12 Sep 2021 14:41:01 +0800 [thread overview]
Message-ID: <20210912064101.539-1-caihuoqing@baidu.com> (raw)
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>
---
v1->v2:
Change the error path-error_disable_reg from "st->vref" to "st->reg".
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->reg);
+
+ return ret;
}
static SIMPLE_DEV_PM_OPS(ad799x_pm_ops, ad799x_suspend, ad799x_resume);
--
2.25.1
next reply other threads:[~2021-09-12 6:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-12 6:41 Cai Huoqing [this message]
2021-09-12 16:42 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210912064101.539-1-caihuoqing@baidu.com \
--to=caihuoqing@baidu.com \
--cc=Michael.Hennerich@analog.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®