From: Markus Elfring <Markus.Elfring@web.de>
To: netdev@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>,
Christophe Jaillet <christophe.jaillet@wanadoo.fr>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Florian Fainelli <florian.fainelli@broadcom.com>,
Jakub Kicinski <kuba@kernel.org>,
Jonas Gorski <jonas.gorski@gmail.com>,
Paolo Abeni <pabeni@redhat.com>,
Vladimir Oltean <olteanv@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org,
Yuanjun Gong <ruc_gongyuanjun@163.com>
Subject: [PATCH net-next V2] net: dsa: bcm_sf2: Use devm_clk_get_optional_enabled() calls in bcm_sf2_sw_probe()
Date: Fri, 20 Nov 2026 11:18:20 +0100 [thread overview]
Message-ID: <abc2c963-f3bc-43e3-a7c0-56e2cde1a268@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 20 Nov 2026 10:45:18 +0100
* Reuse existing functionality from devm_clk_get_optional_enabled()
instead of keeping duplicate source code.
* Omit two clk_disable_unprepare() calls in the remove function
and on error handling paths.
* Delete the labels “out_clk” and “out_clk_mdiv”.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
V2:
Christophe Jaillet and Florian Fainelli requested further adjustments
according to the proposed changes.
drivers/net/dsa/bcm_sf2.c | 29 +++++++----------------------
1 file changed, 7 insertions(+), 22 deletions(-)
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 1747a1f20c78..1279906154bb 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -1467,28 +1467,18 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
base++;
}
- priv->clk = devm_clk_get_optional(&pdev->dev, "sw_switch");
+ priv->clk = devm_clk_get_optional_enabled(&pdev->dev, "sw_switch");
if (IS_ERR(priv->clk))
return PTR_ERR(priv->clk);
- ret = clk_prepare_enable(priv->clk);
- if (ret)
- return ret;
-
- priv->clk_mdiv = devm_clk_get_optional(&pdev->dev, "sw_switch_mdiv");
- if (IS_ERR(priv->clk_mdiv)) {
- ret = PTR_ERR(priv->clk_mdiv);
- goto out_clk;
- }
-
- ret = clk_prepare_enable(priv->clk_mdiv);
- if (ret)
- goto out_clk;
+ priv->clk_mdiv = devm_clk_get_optional_enabled(&pdev->dev, "sw_switch_mdiv");
+ if (IS_ERR(priv->clk_mdiv))
+ return PTR_ERR(priv->clk_mdiv);
ret = bcm_sf2_sw_rst(priv);
if (ret) {
pr_err("unable to software reset switch: %d\n", ret);
- goto out_clk_mdiv;
+ return ret;
}
bcm_sf2_crossbar_setup(priv);
@@ -1498,7 +1488,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
ret = bcm_sf2_mdio_register(ds);
if (ret) {
pr_err("failed to register MDIO bus\n");
- goto out_clk_mdiv;
+ return ret;
}
bcm_sf2_gphy_enable_set(priv->dev->ds, false);
@@ -1565,10 +1555,6 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
out_mdio:
bcm_sf2_mdio_unregister(priv);
-out_clk_mdiv:
- clk_disable_unprepare(priv->clk_mdiv);
-out_clk:
- clk_disable_unprepare(priv->clk);
return ret;
}
@@ -1585,8 +1571,7 @@ static void bcm_sf2_sw_remove(struct platform_device *pdev)
dsa_unregister_switch(priv->dev->ds);
bcm_sf2_cfp_exit(priv->dev->ds);
bcm_sf2_mdio_unregister(priv);
- clk_disable_unprepare(priv->clk_mdiv);
- clk_disable_unprepare(priv->clk);
+
if (priv->type == BCM7278_DEVICE_ID)
reset_control_assert(priv->rcdev);
}
--
2.56.1
reply other threads:[~2026-11-20 10:18 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=abc2c963-f3bc-43e3-a7c0-56e2cde1a268@web.de \
--to=markus.elfring@web.de \
--cc=andrew@lunn.ch \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=florian.fainelli@broadcom.com \
--cc=jonas.gorski@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=ruc_gongyuanjun@163.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®