| Message ID | 20240930211628.330703-1-rosenp@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4c5107b8f508f84cc84ea813232c33426a7f2351 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: marvell: mvmdio: use clk_get_optional | expand |
On Mon, Sep 30, 2024 at 02:16:28PM -0700, Rosen Penev wrote: > The code seems to be handling EPROBE_DEFER explicitly and if there's no > error, enables the clock. clk_get_optional exists for that. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 30 Sep 2024 14:16:28 -0700 you wrote: > The code seems to be handling EPROBE_DEFER explicitly and if there's no > error, enables the clock. clk_get_optional exists for that. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> > --- > drivers/net/ethernet/marvell/mvmdio.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) Here is the summary with links: - [net-next] net: marvell: mvmdio: use clk_get_optional https://git.kernel.org/netdev/net-next/c/4c5107b8f508 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index e1d003fdbc2e..67378e9f538a 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -348,13 +348,12 @@ static int orion_mdio_probe(struct platform_device *pdev) if (type == BUS_TYPE_XSMI) orion_mdio_xsmi_set_mdc_freq(bus); } else { - dev->clk[0] = clk_get(&pdev->dev, NULL); - if (PTR_ERR(dev->clk[0]) == -EPROBE_DEFER) { - ret = -EPROBE_DEFER; + dev->clk[0] = clk_get_optional(&pdev->dev, NULL); + if (IS_ERR(dev->clk[0])) { + ret = PTR_ERR(dev->clk[0]); goto out_clk; } - if (!IS_ERR(dev->clk[0])) - clk_prepare_enable(dev->clk[0]); + clk_prepare_enable(dev->clk[0]); } @@ -422,8 +421,6 @@ static void orion_mdio_remove(struct platform_device *pdev) mdiobus_unregister(bus); for (i = 0; i < ARRAY_SIZE(dev->clk); i++) { - if (IS_ERR(dev->clk[i])) - break; clk_disable_unprepare(dev->clk[i]); clk_put(dev->clk[i]); }
The code seems to be handling EPROBE_DEFER explicitly and if there's no error, enables the clock. clk_get_optional exists for that. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- drivers/net/ethernet/marvell/mvmdio.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)