From: Markus Elfring <Markus.Elfring@web.de>
To: imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
kernel@pengutronix.de, "Bjorn Helgaas" <bhelgaas@google.com>,
"Danilo Krummrich" <dakr@kernel.org>,
"Fabio Estevam" <festevam@gmail.com>,
"Frank Li" <Frank.Li@nxp.com>, "Kees Cook" <kees@kernel.org>,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Christophe Jaillet <christophe.jaillet@wanadoo.fr>,
Florian Fainelli <f.fainelli@gmail.com>,
Michal Simek <michal.simek@amd.com>
Subject: [PATCH] w1: mxc_w1: Use devm_clk_get_enabled() in mxc_w1_probe()
Date: Sun, 22 Nov 2026 18:03:00 +0100 [thread overview]
Message-ID: <4b99426a-d831-4d55-9b3c-ce83ba9fb081@web.de> (raw)
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
reply other threads:[~2026-11-22 17:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4b99426a-d831-4d55-9b3c-ce83ba9fb081@web.de \
--to=markus.elfring@web.de \
--cc=Frank.Li@nxp.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dakr@kernel.org \
--cc=f.fainelli@gmail.com \
--cc=festevam@gmail.com \
--cc=imx@lists.linux.dev \
--cc=kees@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=s.hauer@pengutronix.de \
--cc=u.kleine-koenig@baylibre.com \
/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®