linux-kernel - [PATCH 9/9] mmc: sdhci_f_sdh30: Use devm_clk_get

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240827074857.2671808-10-xirui.zhang@vivo.com>
Date: Tue, 27 Aug 2024 01:48:47 -0600
From: zhangxirui <xirui.zhang@...o.com>
To: Robert Richter <rric@...nel.org>,
	Ulf Hansson <ulf.hansson@...aro.org>,
	Jaehoon Chung <jh80.chung@...sung.com>,
	Nicolas Pitre <nico@...xnic.net>,
	Shawn Guo <shawnguo@...nel.org>,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Pengutronix Kernel Team <kernel@...gutronix.de>,
	Fabio Estevam <festevam@...il.com>,
	Adrian Hunter <adrian.hunter@...el.com>,
	Taichi Sugaya <sugaya.taichi@...ionext.com>,
	Takao Orito <orito.takao@...ionext.com>,
	Michal Simek <michal.simek@....com>,
	zhangxirui <xirui.zhang@...o.com>,
	Linus Walleij <linus.walleij@...aro.org>,
	Bastien Curutchet <bastien.curutchet@...tlin.com>,
	Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
	linux-mmc@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	imx@...ts.linux.dev,
	linux-arm-kernel@...ts.infradead.org
Subject: [PATCH 9/9] mmc: sdhci_f_sdh30: Use devm_clk_get_enabled() helpers

Use devm_clk_get_enabled() to simplify code
and avoids the calls to clk_disable_unprepare().

Signed-off-by: zhangxirui <xirui.zhang@...o.com>
---
 drivers/mmc/host/sdhci_f_sdh30.c | 36 +++++++++-----------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index c58e7cb1e2a7..ba49c5d70ca6 100644
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -21,8 +21,6 @@
 #include "sdhci_f_sdh30.h"
 
 struct f_sdhost_priv {
-	struct clk *clk_iface;
-	struct clk *clk;
 	struct reset_control *rst;
 	u32 vendor_hs200;
 	struct device *dev;
@@ -118,6 +116,8 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)
 	struct f_sdhost_priv *priv;
 	struct sdhci_pltfm_host *pltfm_host;
 	u32 reg = 0;
+	struct clk *clk_iface;
+	struct clk *clk;
 
 	host = sdhci_pltfm_init(pdev, &sdhci_f_sdh30_pltfm_data,
 				sizeof(struct f_sdhost_priv));
@@ -138,35 +138,27 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)
 	if (dev_of_node(dev)) {
 		sdhci_get_of_property(pdev);
 
-		priv->clk_iface = devm_clk_get(&pdev->dev, "iface");
-		if (IS_ERR(priv->clk_iface)) {
-			ret = PTR_ERR(priv->clk_iface);
+		clk_iface = devm_clk_get_enabled(&pdev->dev, "iface");
+		if (IS_ERR(clk_iface)) {
+			ret = PTR_ERR(clk_iface);
 			goto err;
 		}
 
-		ret = clk_prepare_enable(priv->clk_iface);
-		if (ret)
+		clk = devm_clk_get_enabled(&pdev->dev, "core");
+		if (IS_ERR(clk)) {
+			ret = PTR_ERR(clk);
 			goto err;
-
-		priv->clk = devm_clk_get(&pdev->dev, "core");
-		if (IS_ERR(priv->clk)) {
-			ret = PTR_ERR(priv->clk);
-			goto err_clk;
 		}
 
-		ret = clk_prepare_enable(priv->clk);
-		if (ret)
-			goto err_clk;
-
 		priv->rst = devm_reset_control_get_optional_shared(dev, NULL);
 		if (IS_ERR(priv->rst)) {
 			ret = PTR_ERR(priv->rst);
-			goto err_rst;
+			goto err;
 		}
 
 		ret = reset_control_deassert(priv->rst);
 		if (ret)
-			goto err_rst;
+			goto err;
 	}
 
 	/* init vendor specific regs */
@@ -196,10 +188,6 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)
 
 err_add_host:
 	reset_control_assert(priv->rst);
-err_rst:
-	clk_disable_unprepare(priv->clk);
-err_clk:
-	clk_disable_unprepare(priv->clk_iface);
 err:
 	sdhci_pltfm_free(pdev);
 
@@ -210,15 +198,11 @@ static void sdhci_f_sdh30_remove(struct platform_device *pdev)
 {
 	struct sdhci_host *host = platform_get_drvdata(pdev);
 	struct f_sdhost_priv *priv = sdhci_f_sdhost_priv(host);
-	struct clk *clk_iface = priv->clk_iface;
 	struct reset_control *rst = priv->rst;
-	struct clk *clk = priv->clk;
 
 	sdhci_pltfm_remove(pdev);
 
 	reset_control_assert(rst);
-	clk_disable_unprepare(clk);
-	clk_disable_unprepare(clk_iface);
 }
 
 #ifdef CONFIG_OF
-- 
2.25.1