net: ethernet: mtk_eth_soc: remove mac_pcs_get_state and modernise

Remove the .mac_pcs_get_state function, since as far as I can tell is
never called - no DT appears to specify an in-band-status management
nor SFP support for this driver.

Removal of this, along with the previous patch to remove the incorrect
clocking configuration, means that the driver becomes non-legacy, so
we can remove the "legacy_pre_march2020" status from this driver.

Reviewed-by: Daniel Golle <daniel@makrotopia.org>
Tested-by: Daniel Golle <daniel@makrotopia.org>
Tested-by: Frank Wunderlich <frank-w@public-files.de>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index fe8b7e3..7490d48 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -568,38 +568,6 @@ static int mtk_mac_finish(struct phylink_config *config, unsigned int mode,
        return 0;
 }
 
-static void mtk_mac_pcs_get_state(struct phylink_config *config,
-                                 struct phylink_link_state *state)
-{
-       struct mtk_mac *mac = container_of(config, struct mtk_mac,
-                                          phylink_config);
-       u32 pmsr = mtk_r32(mac->hw, MTK_MAC_MSR(mac->id));
-
-       state->link = (pmsr & MAC_MSR_LINK);
-       state->duplex = (pmsr & MAC_MSR_DPX) >> 1;
-
-       switch (pmsr & (MAC_MSR_SPEED_1000 | MAC_MSR_SPEED_100)) {
-       case 0:
-               state->speed = SPEED_10;
-               break;
-       case MAC_MSR_SPEED_100:
-               state->speed = SPEED_100;
-               break;
-       case MAC_MSR_SPEED_1000:
-               state->speed = SPEED_1000;
-               break;
-       default:
-               state->speed = SPEED_UNKNOWN;
-               break;
-       }
-
-       state->pause &= (MLO_PAUSE_RX | MLO_PAUSE_TX);
-       if (pmsr & MAC_MSR_RX_FC)
-               state->pause |= MLO_PAUSE_RX;
-       if (pmsr & MAC_MSR_TX_FC)
-               state->pause |= MLO_PAUSE_TX;
-}
-
 static void mtk_mac_link_down(struct phylink_config *config, unsigned int mode,
                              phy_interface_t interface)
 {
@@ -722,7 +690,6 @@ static void mtk_mac_link_up(struct phylink_config *config,
 
 static const struct phylink_mac_ops mtk_phylink_ops = {
        .mac_select_pcs = mtk_mac_select_pcs,
-       .mac_pcs_get_state = mtk_mac_pcs_get_state,
        .mac_config = mtk_mac_config,
        .mac_finish = mtk_mac_finish,
        .mac_link_down = mtk_mac_link_down,
@@ -4327,8 +4294,6 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
 
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;
-       /* This driver makes use of state->speed in mac_config */
-       mac->phylink_config.legacy_pre_march2020 = true;
        mac->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
                MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;