net: mvneta: remove interface checks in mvneta_validate()

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>

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 7df9236..446cdd4 100644 (file)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3832,15 +3832,8 @@ static void mvneta_validate(struct phylink_config *config,
         * "Bit 2 Field InBandAnEn In-band Auto-Negotiation enable. ...
         * When <PortType> = 1 (1000BASE-X) this field must be set to 1."
         */
-       if (phy_interface_mode_is_8023z(state->interface)) {
-               if (!phylink_test(state->advertising, Autoneg)) {
-                       linkmode_zero(supported);
-                       return;
-               }
-       } else if (state->interface != PHY_INTERFACE_MODE_NA &&
-                  state->interface != PHY_INTERFACE_MODE_QSGMII &&
-                  state->interface != PHY_INTERFACE_MODE_SGMII &&
-                  !phy_interface_mode_is_rgmii(state->interface)) {
+       if (phy_interface_mode_is_8023z(state->interface) &&
+           !phylink_test(state->advertising, Autoneg)) {
                linkmode_zero(supported);
                return;
        }