From: Ziliang Liao <saraday@hust.edu.cn>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>
Cc: hust-os-kernel-patches@googlegroups.com,
Ziliang Liao <saraday@hust.edu.cn>,
Dongliang Mu <dzm91@hust.edu.cn>,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] bus: qcom-ebi2: use prefix devm for clock resource allocation functions
Date: Sun, 30 Apr 2023 20:51:53 +0800 [thread overview]
Message-ID: <20230430125154.126863-1-saraday@hust.edu.cn> (raw)
Smatch reports:
drivers/bus/qcom-ebi2.c:387 qcom_ebi2_probe() warn: 'ebi2clk' from
clk_prepare_enable() not released on lines: 358.
drivers/bus/qcom-ebi2.c:387 qcom_ebi2_probe() warn: 'ebi2xclk' from
clk_prepare_enabled() not released on lines: 358.
The clk_disable_unprepare() is only used to explicitly release resources
when the qcom_ebi2_probe() fails, and when executed correctly, it may
cause resource leakage due to unknown release time.
Replace devm_clk_get() and clk_prepare_enable() with
devm_clk_get_enabled() to automatically manage the allocated resources.
Fixes: 335a12754808 ("bus: qcom: add EBI2 driver")
Signed-off-by: Ziliang Liao <saraday@hust.edu.cn>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
---
The issue is found by static analyzer. The patched code has passed
Smatch checker, but remains untested on real device.
drivers/bus/qcom-ebi2.c | 35 ++++++++---------------------------
1 file changed, 8 insertions(+), 27 deletions(-)
diff --git a/drivers/bus/qcom-ebi2.c b/drivers/bus/qcom-ebi2.c
index c1fef1b4bd89..3999e969e1cf 100644
--- a/drivers/bus/qcom-ebi2.c
+++ b/drivers/bus/qcom-ebi2.c
@@ -303,40 +303,28 @@ static int qcom_ebi2_probe(struct platform_device *pdev)
u32 val;
int ret;
- ebi2xclk = devm_clk_get(dev, "ebi2x");
- if (IS_ERR(ebi2xclk))
+ ebi2xclk = devm_clk_get_enabled(dev, "ebi2x");
+ if (IS_ERR(ebi2xclk)) {
+ dev_err(dev, "could not enable EBI2X clk");
return PTR_ERR(ebi2xclk);
-
- ret = clk_prepare_enable(ebi2xclk);
- if (ret) {
- dev_err(dev, "could not enable EBI2X clk (%d)\n", ret);
- return ret;
}
- ebi2clk = devm_clk_get(dev, "ebi2");
+ ebi2clk = devm_clk_get_enabled(dev, "ebi2");
if (IS_ERR(ebi2clk)) {
- ret = PTR_ERR(ebi2clk);
- goto err_disable_2x_clk;
- }
-
- ret = clk_prepare_enable(ebi2clk);
- if (ret) {
- dev_err(dev, "could not enable EBI2 clk\n");
- goto err_disable_2x_clk;
+ dev_err(dev, "could not enable EBI2 clk");
+ return PTR_ERR(ebi2clk);
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
ebi2_base = devm_ioremap_resource(dev, res);
if (IS_ERR(ebi2_base)) {
- ret = PTR_ERR(ebi2_base);
- goto err_disable_clk;
+ return PTR_ERR(ebi2_base);
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
ebi2_xmem = devm_ioremap_resource(dev, res);
if (IS_ERR(ebi2_xmem)) {
- ret = PTR_ERR(ebi2_xmem);
- goto err_disable_clk;
+ return PTR_ERR(ebi2_xmem);
}
/* Allegedly this turns the power save mode off */
@@ -378,13 +366,6 @@ static int qcom_ebi2_probe(struct platform_device *pdev)
if (have_children)
return of_platform_default_populate(np, NULL, dev);
return 0;
-
-err_disable_clk:
- clk_disable_unprepare(ebi2clk);
-err_disable_2x_clk:
- clk_disable_unprepare(ebi2xclk);
-
- return ret;
}
static const struct of_device_id qcom_ebi2_of_match[] = {
--
2.25.1
next reply other threads:[~2023-04-30 12:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-30 12:51 Ziliang Liao [this message]
2023-04-30 12:51 ` [PATCH 2/2] bus: qcom-ebi2: simplify the code in qcom_ebi2_probe() Ziliang Liao
2023-05-08 13:35 ` Linus Walleij
2023-05-08 16:22 ` Ziliang Liao
2023-05-09 7:06 ` Linus Walleij
2023-05-08 13:34 ` [PATCH 1/2] bus: qcom-ebi2: use prefix devm for clock resource allocation functions Linus Walleij
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=20230430125154.126863-1-saraday@hust.edu.cn \
--to=saraday@hust.edu.cn \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=dzm91@hust.edu.cn \
--cc=hust-os-kernel-patches@googlegroups.com \
--cc=konrad.dybcio@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-msm@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®