net: dsa: remove dsa_port_phylink_validate()

As all drivers now provide phylink capabilities (including MAC), the
if() condition in dsa_port_phylink_validate() will always be true. We
will always use the generic validator, which phylink will call itself
if the .validate method isn't populated. Thus, there is now no need to
implement the .validate method, so this implementation can be removed.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/port.c b/net/dsa/port.c
index 5f01bd4f9decf61963c05eac012790079e34f106..6e0d000a97c4cc45cf8d60256654e8e9b02e4010 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1554,20 +1554,6 @@ static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp)
        return phydev;
 }
 
-static void dsa_port_phylink_validate(struct phylink_config *config,
-                                     unsigned long *supported,
-                                     struct phylink_link_state *state)
-{
-       /* Skip call for drivers which don't yet set mac_capabilities,
-        * since validating in that case would mean their PHY will advertise
-        * nothing. In turn, skipping validation makes them advertise
-        * everything that the PHY supports, so those drivers should be
-        * converted ASAP.
-        */
-       if (config->mac_capabilities)
-               phylink_generic_validate(config, supported, state);
-}
-
 static struct phylink_pcs *
 dsa_port_phylink_mac_select_pcs(struct phylink_config *config,
                                phy_interface_t interface)
@@ -1666,7 +1652,6 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config,
 }
 
 static const struct phylink_mac_ops dsa_port_phylink_mac_ops = {
-       .validate = dsa_port_phylink_validate,
        .mac_select_pcs = dsa_port_phylink_mac_select_pcs,
        .mac_prepare = dsa_port_phylink_mac_prepare,
        .mac_config = dsa_port_phylink_mac_config,