* [PATCH net-next V2] net: dsa: bcm_sf2: Use devm_clk_get_optional_enabled() calls in bcm_sf2_sw_probe()
@ 2026-11-20 10:18 Markus Elfring
0 siblings, 0 replies; only message in thread
From: Markus Elfring @ 2026-11-20 10:18 UTC (permalink / raw)
To: netdev, Andrew Lunn, Christophe Jaillet, David S. Miller,
Eric Dumazet, Florian Fainelli, Jakub Kicinski, Jonas Gorski,
Paolo Abeni, Vladimir Oltean
Cc: LKML, kernel-janitors, Yuanjun Gong
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-20 10:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-20 10:18 [PATCH net-next V2] net: dsa: bcm_sf2: Use devm_clk_get_optional_enabled() calls in bcm_sf2_sw_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®