net: dsa: ocelot: remove interface checks

When the supported interfaces bitmap is populated, phylink will itself
check that the interface mode is present in this bitmap. Drivers no
longer need to perform this check themselves. Remove these checks.

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 33f0ceae381d43dc42bb8a3e9bed008c8d38e883..434c7e4f064813c2518588f9315fc929a519a556 100644 (file)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -944,15 +944,8 @@ static void vsc9959_phylink_validate(struct ocelot *ocelot, int port,
                                     unsigned long *supported,
                                     struct phylink_link_state *state)
 {
-       struct ocelot_port *ocelot_port = ocelot->ports[port];
        __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
 
-       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, Autoneg);
        phylink_set(mask, Pause);

diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index f2f1608a476c87d9318f01ccdd6dbcd04bafa5d0..f12c1a1a3d5c9d51e90d082b5720024c34489071 100644 (file)
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -917,15 +917,8 @@ static void vsc9953_phylink_validate(struct ocelot *ocelot, int port,
                                     unsigned long *supported,
                                     struct phylink_link_state *state)
 {
-       struct ocelot_port *ocelot_port = ocelot->ports[port];
        __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
 
-       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, Autoneg);
        phylink_set(mask, Pause);