leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: mvpp2: clean up mvpp2_phylink_validate()

Browse Source 
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>
This commit is contained in:
Russell King (Oracle)
2021-10-27 10:49:29 +01:00
committed by David S. Miller
parent 76947a6358
commit b63f1117ae
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
View File

@@ -6280,14 +6280,12 @@ static void mvpp2_phylink_validate(struct phylink_config *config,
switch (state->interface) { switch (state->interface) {
case PHY_INTERFACE_MODE_10GBASER: case PHY_INTERFACE_MODE_10GBASER:
case PHY_INTERFACE_MODE_XAUI: case PHY_INTERFACE_MODE_XAUI:
case PHY_INTERFACE_MODE_NA:
if (mvpp2_port_supports_xlg(port)) { if (mvpp2_port_supports_xlg(port)) {
phylink_set_10g_modes(mask); phylink_set_10g_modes(mask);
phylink_set(mask, 10000baseKR_Full); phylink_set(mask, 10000baseKR_Full);
} }
if (state->interface != PHY_INTERFACE_MODE_NA)
break; break;
fallthrough;
case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII:
case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_RGMII_ID:
case PHY_INTERFACE_MODE_RGMII_RXID: 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, 100baseT_Full);
phylink_set(mask, 1000baseT_Full); phylink_set(mask, 1000baseT_Full);
phylink_set(mask, 1000baseX_Full); phylink_set(mask, 1000baseX_Full);
if (state->interface != PHY_INTERFACE_MODE_NA)
break; break;
fallthrough;
case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_1000BASEX:
phylink_set(mask, 1000baseT_Full); phylink_set(mask, 1000baseT_Full);
phylink_set(mask, 1000baseX_Full); phylink_set(mask, 1000baseX_Full);
if (state->interface != PHY_INTERFACE_MODE_NA)
break; break;
fallthrough;
case PHY_INTERFACE_MODE_2500BASEX: case PHY_INTERFACE_MODE_2500BASEX:
phylink_set(mask, 2500baseT_Full); phylink_set(mask, 2500baseT_Full);
phylink_set(mask, 2500baseX_Full); phylink_set(mask, 2500baseX_Full);
break; break;
default: default:
goto empty_set; goto empty_set;
} }