[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20240823080939.2084108-1-bo.wu@vivo.com>
Date: Fri, 23 Aug 2024 02:09:39 -0600
From: Wu Bo <bo.wu@...o.com>
To: linux-kernel@...r.kernel.org
Cc: Bjorn Andersson <andersson@...nel.org>,
Konrad Dybcio <konradybcio@...nel.org>,
linux-arm-msm@...r.kernel.org,
Wu Bo <wubo.oduw@...il.com>,
Wu Bo <bo.wu@...o.com>
Subject: [PATCH] bus: qcom-ebi2: change to use devm_clk_get_enabled() helpers
Make the code cleaner and avoid call clk_disable_unprepare()
Signed-off-by: Wu Bo <bo.wu@...o.com>
---
drivers/bus/qcom-ebi2.c | 34 +++++++++-------------------------
1 file changed, 9 insertions(+), 25 deletions(-)
diff --git a/drivers/bus/qcom-ebi2.c b/drivers/bus/qcom-ebi2.c
index c1fef1b4bd89..a5c721f6180b 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");
+ ebi2xclk = devm_clk_get_enabled(dev, "ebi2x");
if (IS_ERR(ebi2xclk))
- return PTR_ERR(ebi2xclk);
-
- ret = clk_prepare_enable(ebi2xclk);
- if (ret) {
- dev_err(dev, "could not enable EBI2X clk (%d)\n", ret);
- return ret;
- }
+ return dev_err_probe(dev, PTR_ERR(ebi2xclk),
+ "could not enable EBI2X clk\n");
ebi2clk = devm_clk_get(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;
- }
+ if (IS_ERR(ebi2clk))
+ return dev_err_probe(dev, PTR_ERR(ebi2clk),
+ "could not enable EBI2 clk\n");
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;
+ goto out;
}
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;
+ goto out;
}
/* Allegedly this turns the power save mode off */
@@ -379,11 +367,7 @@ static int qcom_ebi2_probe(struct platform_device *pdev)
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);
-
+out:
return ret;
}
--
2.25.1
Powered by blists - more mailing lists