From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Barry Song <baohua@kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Krzysztof Kozlowski <krzk@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Patrice Chotard <patrice.chotard@st.com>,
Rob Herring <robh@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] pinctrl: sirf: Use common error handling code in sirfsoc_dt_node_to_map()
Date: Mon, 30 Oct 2017 19:36:40 +0100 [thread overview]
Message-ID: <80911d4b-d819-335c-106e-70d7672e645b@users.sourceforge.net> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 30 Oct 2017 19:26:56 +0100
Add a jump target so that a bit of exception handling can be better reused
at the end of this function.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/pinctrl/sirf/pinctrl-sirf.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
index d64add0b84cc..5ec2f37f5180 100644
--- a/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
@@ -89,16 +89,12 @@ static int sirfsoc_dt_node_to_map(struct pinctrl_dev *pctldev,
/* calculate number of maps required */
for_each_child_of_node(np_config, np) {
ret = of_property_read_string(np, "sirf,function", &function);
- if (ret < 0) {
- of_node_put(np);
- return ret;
- }
+ if (ret < 0)
+ goto put_node;
ret = of_property_count_strings(np, "sirf,pins");
- if (ret < 0) {
- of_node_put(np);
- return ret;
- }
+ if (ret < 0)
+ goto put_node;
count += ret;
}
@@ -125,6 +121,10 @@ static int sirfsoc_dt_node_to_map(struct pinctrl_dev *pctldev,
*num_maps = count;
return 0;
+
+put_node:
+ of_node_put(np);
+ return ret;
}
static void sirfsoc_dt_free_map(struct pinctrl_dev *pctldev,
--
2.14.3
next reply other threads:[~2017-10-30 18:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 18:36 SF Markus Elfring [this message]
2017-10-30 19:15 ` [PATCH] pinctrl: sirf: Use common error handling code in sirfsoc_dt_node_to_map() Geert Uytterhoeven
2017-10-30 19:32 ` SF Markus Elfring
2017-10-30 19:34 ` Geert Uytterhoeven
2017-10-30 19:41 ` SF Markus Elfring
2017-11-01 10:33 ` [PATCH] " Dan Carpenter
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=80911d4b-d819-335c-106e-70d7672e645b@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=Julia.Lawall@lip6.fr \
--cc=baohua@kernel.org \
--cc=geert+renesas@glider.be \
--cc=kernel-janitors@vger.kernel.org \
--cc=krzk@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=patrice.chotard@st.com \
--cc=robh@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;
as well as URLs for NNTP newsgroup(s).