mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] w1: mxc_w1: Use devm_clk_get_enabled() in mxc_w1_probe()
@ 2026-11-22 17:03 Markus Elfring
  0 siblings, 0 replies; only message in thread
From: Markus Elfring @ 2026-11-22 17:03 UTC (permalink / raw)
  To: imx, linux-arm-kernel, kernel, Bjorn Helgaas, Danilo Krummrich,
	Fabio Estevam, Frank Li, Kees Cook, Krzysztof Kozlowski,
	Sascha Hauer, Uwe Kleine-König
  Cc: LKML, kernel-janitors, Andy Shevchenko, Christophe Jaillet,
	Florian Fainelli, Michal Simek

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 22 Nov 2026 17:52:20 +0100

* Reuse existing functionality from devm_clk_get_enabled() instead of
  keeping duplicate source code.

* Omit a clk_disable_unprepare() call on an error handling path
  and in the implementation of the function “mxc_w1_remove”.

* Delete the label “out_disable_clk”.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/w1/masters/mxc_w1.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 06be7bf0b715..f40ea120127c 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -98,14 +98,10 @@ static int mxc_w1_probe(struct platform_device *pdev)
 	if (!mdev)
 		return -ENOMEM;
 
-	mdev->clk = devm_clk_get(&pdev->dev, NULL);
+	mdev->clk = devm_clk_get_enabled(&pdev->dev, NULL);
 	if (IS_ERR(mdev->clk))
 		return PTR_ERR(mdev->clk);
 
-	err = clk_prepare_enable(mdev->clk);
-	if (err)
-		return err;
-
 	clkrate = clk_get_rate(mdev->clk);
 	if (clkrate < 10000000)
 		dev_warn(&pdev->dev,
@@ -118,10 +114,8 @@ static int mxc_w1_probe(struct platform_device *pdev)
 			 "Incorrect time base frequency %lu Hz\n", clkrate);
 
 	mdev->regs = devm_platform_ioremap_resource(pdev, 0);
-	if (IS_ERR(mdev->regs)) {
-		err = PTR_ERR(mdev->regs);
-		goto out_disable_clk;
-	}
+	if (IS_ERR(mdev->regs))
+		return PTR_ERR(mdev->regs);
 
 	/* Software reset 1-Wire module */
 	writeb(MXC_W1_RESET_RST, mdev->regs + MXC_W1_RESET);
@@ -137,13 +131,9 @@ static int mxc_w1_probe(struct platform_device *pdev)
 
 	err = w1_add_master_device(&mdev->bus_master);
 	if (err)
-		goto out_disable_clk;
+		return err;
 
 	return 0;
-
-out_disable_clk:
-	clk_disable_unprepare(mdev->clk);
-	return err;
 }
 
 /*
@@ -154,8 +144,6 @@ static void mxc_w1_remove(struct platform_device *pdev)
 	struct mxc_w1_device *mdev = platform_get_drvdata(pdev);
 
 	w1_remove_master_device(&mdev->bus_master);
-
-	clk_disable_unprepare(mdev->clk);
 }
 
 static const struct of_device_id mxc_w1_dt_ids[] = {
-- 
2.56.1


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-22 17:04 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-22 17:03 [PATCH] w1: mxc_w1: Use devm_clk_get_enabled() in mxc_w1_probe() Markus Elfring

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®