net: stmmac: rk: remove unnecessary clk_mac

The stmmac platform code already gets the "stmmaceth" clock, so there
is no need for drivers to get it. Use the stored pointer in struct
plat_stmmacenet_data instead of getting and storing our own pointer.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1uR6sj-004Ku5-HR@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 7ee101a6cfcf78a9d519ebbe3909a864a324880e..79b92130a03faafbd26a0edf1a73199ecbb6e82b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -80,7 +80,6 @@ struct rk_priv_data {
 
        struct clk_bulk_data *clks;
        int num_clks;
-       struct clk *clk_mac;
        struct clk *clk_phy;
 
        struct reset_control *phy_reset;
@@ -1408,16 +1407,10 @@ static int rk_gmac_clk_init(struct plat_stmmacenet_data *plat)
        if (ret)
                return dev_err_probe(dev, ret, "Failed to get clocks\n");
 
-       /* "stmmaceth" will be enabled by the core */
-       bsp_priv->clk_mac = devm_clk_get(dev, "stmmaceth");
-       ret = PTR_ERR_OR_ZERO(bsp_priv->clk_mac);
-       if (ret)
-               return dev_err_probe(dev, ret, "Cannot get stmmaceth clock\n");
-
        if (bsp_priv->clock_input) {
                dev_info(dev, "clock input from PHY\n");
        } else if (phy_iface == PHY_INTERFACE_MODE_RMII) {
-               clk_set_rate(bsp_priv->clk_mac, 50000000);
+               clk_set_rate(plat->stmmac_clk, 50000000);
        }
 
        if (plat->phy_node && bsp_priv->integrated_phy) {