net: mvpp2: clean up mvpp2_phylink_validate()

mvpp2_phylink_validate() no longer needs to check for
PHY_INTERFACE_MODE_NA as phylink will walk the supported interface
types to discover the link mode capabilities. Remove these checks.

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 d590440..587def6 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6280,14 +6280,12 @@ static void mvpp2_phylink_validate(struct phylink_config *config,
        switch (state->interface) {
        case PHY_INTERFACE_MODE_10GBASER:
        case PHY_INTERFACE_MODE_XAUI:
-       case PHY_INTERFACE_MODE_NA:
                if (mvpp2_port_supports_xlg(port)) {
                        phylink_set_10g_modes(mask);
                        phylink_set(mask, 10000baseKR_Full);
                }
-               if (state->interface != PHY_INTERFACE_MODE_NA)
-                       break;
-               fallthrough;
+               break;
+
        case PHY_INTERFACE_MODE_RGMII:
        case PHY_INTERFACE_MODE_RGMII_ID:
        case PHY_INTERFACE_MODE_RGMII_RXID:
@@ -6299,19 +6297,18 @@ static void mvpp2_phylink_validate(struct phylink_config *config,
                phylink_set(mask, 100baseT_Full);
                phylink_set(mask, 1000baseT_Full);
                phylink_set(mask, 1000baseX_Full);
-               if (state->interface != PHY_INTERFACE_MODE_NA)
-                       break;
-               fallthrough;
+               break;
+
        case PHY_INTERFACE_MODE_1000BASEX:
                phylink_set(mask, 1000baseT_Full);
                phylink_set(mask, 1000baseX_Full);
-               if (state->interface != PHY_INTERFACE_MODE_NA)
-                       break;
-               fallthrough;
+               break;
+
        case PHY_INTERFACE_MODE_2500BASEX:
                phylink_set(mask, 2500baseT_Full);
                phylink_set(mask, 2500baseX_Full);
                break;
+
        default:
                goto empty_set;
        }