net: ocelot_net: remove interface checks in macb_validate()
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tue, 16 Nov 2021 10:09:36 +0000 (10:09 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Nov 2021 11:25:45 +0000 (11:25 +0000)
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>
drivers/net/ethernet/mscc/ocelot_net.c

index 37c158d..21df548 100644 (file)
@@ -1502,17 +1502,8 @@ static void vsc7514_phylink_validate(struct phylink_config *config,
                                     unsigned long *supported,
                                     struct phylink_link_state *state)
 {
-       struct net_device *ndev = to_net_dev(config->dev);
-       struct ocelot_port_private *priv = netdev_priv(ndev);
-       struct ocelot_port *ocelot_port = &priv->port;
        __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = {};
 
-       if (state->interface != PHY_INTERFACE_MODE_NA &&
-           state->interface != ocelot_port->phy_mode) {
-               linkmode_zero(supported);
-               return;
-       }
-
        phylink_set_port_modes(mask);
 
        phylink_set(mask, Pause);