Commit b63f1117 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76947a63

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+7 −10
Original line number Diff line number Diff line
@@ -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;



	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;



	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:

		phylink_set(mask, 2500baseT_Full);

		phylink_set(mask, 2500baseX_Full);

		break;



	default:

		goto empty_set;

	}