linux-kernel - [PATCH 4/9] mmc: mvsdio: 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-5-xirui.zhang@vivo.com>
Date: Tue, 27 Aug 2024 01:48:42 -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>,
	Bartosz Golaszewski <bartosz.golaszewski@...aro.org>,
	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 4/9] mmc: mvsdio: 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/mvsdio.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index af7f21888e27..c102eff30b40 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -48,7 +48,6 @@ struct mvsd_host {
 	struct timer_list timer;
 	struct mmc_host *mmc;
 	struct device *dev;
-	struct clk *clk;
 };
 
 #define mvsd_write(offs, val)	writel(val, iobase + (offs))
@@ -731,6 +730,7 @@ static int mvsd_probe(struct platform_device *pdev)
 	struct mmc_host *mmc = NULL;
 	struct mvsd_host *host = NULL;
 	const struct mbus_dram_target_info *dram;
+	struct clk *clk;
 	int ret, irq;
 
 	if (!np) {
@@ -758,13 +758,12 @@ static int mvsd_probe(struct platform_device *pdev)
 	 * clock associated to the SDIO interface (it can simply be a
 	 * fixed rate clock).
 	 */
-	host->clk = devm_clk_get(&pdev->dev, NULL);
-	if (IS_ERR(host->clk)) {
+	clk = devm_clk_get_enabled(&pdev->dev, NULL);
+	if (IS_ERR(clk)) {
 		dev_err(&pdev->dev, "no clock associated\n");
 		ret = -EINVAL;
 		goto out;
 	}
-	clk_prepare_enable(host->clk);
 
 	mmc->ops = &mvsd_ops;
 
@@ -780,7 +779,7 @@ static int mvsd_probe(struct platform_device *pdev)
 	mmc->max_seg_size = mmc->max_blk_size * mmc->max_blk_count;
 	mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
 
-	host->base_clock = clk_get_rate(host->clk) / 2;
+	host->base_clock = clk_get_rate(clk) / 2;
 	ret = mmc_of_parse(mmc);
 	if (ret < 0)
 		goto out;
@@ -823,8 +822,6 @@ static int mvsd_probe(struct platform_device *pdev)
 
 out:
 	if (mmc) {
-		if (!IS_ERR(host->clk))
-			clk_disable_unprepare(host->clk);
 		mmc_free_host(mmc);
 	}
 
@@ -841,8 +838,6 @@ static void mvsd_remove(struct platform_device *pdev)
 	del_timer_sync(&host->timer);
 	mvsd_power_down(host);
 
-	if (!IS_ERR(host->clk))
-		clk_disable_unprepare(host->clk);
 	mmc_free_host(mmc);
 }
 
-- 
2.25.1