net: stmmac: rk: put the PHY clock on remove

The PHY clock (bsp_priv->clk_phy) is obtained using of_clk_get(), which
doesn't take part in the devm release. Therefore, when a device is
unbound, this clock needs to be explicitly put. Fix this.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Simon Horman <horms@kernel.org>
Fixes: fecd4d7eef8b ("net: stmmac: dwmac-rk: Add integrated PHY support")
Link: https://patch.msgid.link/E1ukM1S-0086qo-PC@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 79b92130a03faafbd26a0edf1a73199ecbb6e82b..f6687c2f30f644d61c252494cbdf384fec99116c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -1765,11 +1765,15 @@ err_gmac_powerdown:
 
 static void rk_gmac_remove(struct platform_device *pdev)
 {
-       struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(&pdev->dev);
+       struct stmmac_priv *priv = netdev_priv(platform_get_drvdata(pdev));
+       struct rk_priv_data *bsp_priv = priv->plat->bsp_priv;
 
        stmmac_dvr_remove(&pdev->dev);
 
        rk_gmac_powerdown(bsp_priv);
+
+       if (priv->plat->phy_node && bsp_priv->integrated_phy)
+               clk_put(bsp_priv->clk_phy);
 }
 
 #ifdef CONFIG_PM_SLEEP