mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 18:12:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: axienet: remove interface checks in axienet_validate()

Browse Source 
As phylink checks the interface mode against the supported_interfaces
bitmap, we no longer need to validate the interface mode in the
validation function. Remove this to simplify it.

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-11-16 09:55:27 +00:00
committed by David S. Miller
parent 136a3fa28a
commit 5703a4b664
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View File

@@ -1507,29 +1507,8 @@ static void axienet_validate(struct phylink_config *config,
unsigned long *supported,
struct phylink_link_state *state)
{
struct net_device *ndev = to_net_dev(config->dev);
struct axienet_local *lp = netdev_priv(ndev);
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
/* Only support the mode we are configured for */
switch (state->interface) {
case PHY_INTERFACE_MODE_NA:
break;
case PHY_INTERFACE_MODE_1000BASEX:
case PHY_INTERFACE_MODE_SGMII:
if (lp->switch_x_sgmii)
break;
fallthrough;
default:
if (state->interface != lp->phy_mode) {
netdev_warn(ndev, "Cannot use PHY mode %s, supported: %s\n",
phy_modes(state->interface),
phy_modes(lp->phy_mode));
linkmode_zero(supported);
return;
}
}
phylink_set(mask, Autoneg);
phylink_set_port_modes(mask);
@@ -1537,7 +1516,6 @@ static void axienet_validate(struct phylink_config *config,
phylink_set(mask, Pause);
switch (state->interface) {
case PHY_INTERFACE_MODE_NA:
case PHY_INTERFACE_MODE_1000BASEX:
case PHY_INTERFACE_MODE_SGMII:
case PHY_INTERFACE_MODE_GMII: