net: mvpp2: drop use of phylink_helper_basex_speed()

Now that we have a better method to select SFP interface modes, we
no longer need to use phylink_helper_basex_speed() in a driver's
validation function, and we can also get rid of our hack to indicate
both 1000base-X and 2500base-X if the comphy is present to make that
work. Remove this hack and use of phylink_helper_basex_speed().

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 48703b6dff1e5e1d38d3910aa08487763d323e36..d5904408e3a545c23906c6fa9baa8e9ec9af4957 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6303,17 +6303,14 @@ static void mvpp2_phylink_validate(struct phylink_config *config,
                        break;
                fallthrough;
        case PHY_INTERFACE_MODE_1000BASEX:
+               phylink_set(mask, 1000baseT_Full);
+               phylink_set(mask, 1000baseX_Full);
+               if (state->interface != PHY_INTERFACE_MODE_NA)
+                       break;
+               fallthrough;
        case PHY_INTERFACE_MODE_2500BASEX:
-               if (port->comphy ||
-                   state->interface != PHY_INTERFACE_MODE_2500BASEX) {
-                       phylink_set(mask, 1000baseT_Full);
-                       phylink_set(mask, 1000baseX_Full);
-               }
-               if (port->comphy ||
-                   state->interface == PHY_INTERFACE_MODE_2500BASEX) {
-                       phylink_set(mask, 2500baseT_Full);
-                       phylink_set(mask, 2500baseX_Full);
-               }
+               phylink_set(mask, 2500baseT_Full);
+               phylink_set(mask, 2500baseX_Full);
                break;
        default:
                goto empty_set;
@@ -6321,8 +6318,6 @@ static void mvpp2_phylink_validate(struct phylink_config *config,
 
        linkmode_and(supported, supported, mask);
        linkmode_and(state->advertising, state->advertising, mask);
-
-       phylink_helper_basex_speed(state);
        return;
 
 empty_set: