From: Markus Elfring <Markus.Elfring@web.de>
To: Kuan-Wei Chiu <visitorckw@gmail.com>,
Abel Vesa <abelvesa@kernel.org>,
Fabio Estevam <festevam@gmail.com>,
Michael Turquette <mturquette@baylibre.com>,
Peng Fan <peng.fan@nxp.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Shawn Guo <shawnguo@kernel.org>, Stephen Boyd <sboyd@kernel.org>,
kernel@pengutronix.de, linux-imx@nxp.com,
linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: LKML <linux-kernel@vger.kernel.org>, cocci@inria.fr
Subject: [cocci] [PATCH] clk: imx: scu: Use common error handling code in __imx_clk_gpr_scu()
Date: Fri, 22 Dec 2023 10:23:13 +0100 [thread overview]
Message-ID: <0e906ec6-fe73-4dbd-b555-a2c03b6e1030@web.de> (raw)
In-Reply-To: <20231210171907.3410922-1-visitorckw@gmail.com>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 22 Dec 2023 10:05:32 +0100
Use another label so that a bit of exception handling can be better reused
at the end of this function.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/clk/imx/clk-scu.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c
index e48a904c0013..4ca9dccf3d3b 100644
--- a/drivers/clk/imx/clk-scu.c
+++ b/drivers/clk/imx/clk-scu.c
@@ -882,19 +882,19 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na
return ERR_PTR(-ENOMEM);
if (!imx_scu_clk_is_valid(rsrc_id)) {
- kfree(clk_node);
- return ERR_PTR(-EINVAL);
+ ret = -EINVAL;
+ goto free_clk_node;
}
if (!imx_clk_is_resource_owned(rsrc_id)) {
- kfree(clk_node);
- return NULL;
+ ret = 0;
+ goto free_clk_node;
}
clk = kzalloc(sizeof(*clk), GFP_KERNEL);
if (!clk) {
- kfree(clk_node);
- return ERR_PTR(-ENOMEM);
+ ret = -ENOMEM;
+ goto free_clk_node;
}
clk->rsrc_id = rsrc_id;
@@ -922,6 +922,7 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na
ret = clk_hw_register(NULL, hw);
if (ret) {
kfree(clk);
+free_clk_node:
kfree(clk_node);
hw = ERR_PTR(ret);
} else {
--
2.43.0
next parent reply other threads:[~2023-12-22 9:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20231210171907.3410922-1-visitorckw@gmail.com>
2023-12-22 9:23 ` Markus Elfring [this message]
[not found] ` <Zb04UUeE/cU9HtKZ@linaro.org>
2024-02-02 20:21 ` [cocci] clk: imx: scu: Use common error handling code in __imx_clk_gpr_scu() Markus Elfring
[not found] ` <ZdxVHLce6mk975Zp@linaro.org>
2024-02-26 14:35 ` Markus Elfring
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=0e906ec6-fe73-4dbd-b555-a2c03b6e1030@web.de \
--to=markus.elfring@web.de \
--cc=abelvesa@kernel.org \
--cc=cocci@inria.fr \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=peng.fan@nxp.com \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
--cc=visitorckw@gmail.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).