net: mtk_eth_soc: stop passing phylink state to sgmii setup

Now that mtk_sgmii_setup_mode_force() only uses the interface mode
from the phylink state, pass just the interface mode into this
function.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 6c3d5f165e3d57f5ef4e4d46cd906aaa08b3e430..080f7e35659132638d6dbaa4d4a7bd26310787c0 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -390,7 +390,7 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode,
                /* Setup SGMIISYS with the determined property */
                if (state->interface != PHY_INTERFACE_MODE_SGMII)
                        err = mtk_sgmii_setup_mode_force(eth->sgmii, sid,
-                                                        state);
+                                                        state->interface);
                else if (phylink_autoneg_inband(mode))
                        err = mtk_sgmii_setup_mode_an(eth->sgmii, sid);
 

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index 7540dcb06a72ddac5c9ab3a687a7de30100feeb0..455b1460160e35c005e94d96135fee49b8291f88 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -1016,7 +1016,7 @@ int mtk_sgmii_init(struct mtk_sgmii *ss, struct device_node *np,
                   u32 ana_rgc3);
 int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id);
 int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,
-                              const struct phylink_link_state *state);
+                              phy_interface_t interface);
 void mtk_sgmii_link_up(struct mtk_sgmii *ss, int id, int speed, int duplex);
 void mtk_sgmii_restart_an(struct mtk_eth *eth, int mac_id);
 

diff --git a/drivers/net/ethernet/mediatek/mtk_sgmii.c b/drivers/net/ethernet/mediatek/mtk_sgmii.c
index f07a9d50a77049989e76388a019ae2edae393a40..38d52386c88f84d5209256921ccefcd21ae7ef97 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_sgmii.c
+++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c
@@ -65,7 +65,7 @@ int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id)
  * fixed speed.
  */
 int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,
-                              const struct phylink_link_state *state)
+                              phy_interface_t interface)
 {
        unsigned int val;
 
@@ -74,7 +74,7 @@ int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,
 
        regmap_read(ss->regmap[id], ss->ana_rgc3, &val);
        val &= ~RG_PHY_SPEED_MASK;
-       if (state->interface == PHY_INTERFACE_MODE_2500BASEX)
+       if (interface == PHY_INTERFACE_MODE_2500BASEX)
                val |= RG_PHY_SPEED_3_125G;
        regmap_write(ss->regmap[id], ss->ana_rgc3, val);