提交 b63f1117 编写于 作者: R Russell King (Oracle) 提交者: David S. Miller

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: NRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 76947a63
...@@ -6280,14 +6280,12 @@ static void mvpp2_phylink_validate(struct phylink_config *config, ...@@ -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, ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册