net: stmmac: convert to phylink_generic_validate()

Convert stmmac to use phylink_generic_validate() now that we have the
MAC capabilities and supported interfaces filled in, and we have the
PCS validation handled via the PCS operations.

Tested-by: Wong Vee Khee <vee.khee.wong@linux.intel.com> # Intel EHL            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/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 1b6bba65670907fed86b642110e39aa06a8f6f6d..0fd96a98f48903e15e41df4f5c31cbe3d9abe3cd 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -936,29 +936,6 @@ static void stmmac_mac_flow_ctrl(struct stmmac_priv *priv, u32 duplex)
                        priv->pause, tx_cnt);
 }
 
-static void stmmac_validate(struct phylink_config *config,
-                           unsigned long *supported,
-                           struct phylink_link_state *state)
-{
-       __ETHTOOL_DECLARE_LINK_MODE_MASK(mac_supported) = { 0, };
-
-       /* This is very similar to phylink_generic_validate() except that
-        * we always use PHY_INTERFACE_MODE_INTERNAL to get all capabilities.
-        * This is because we don't always have config->supported_interfaces
-        * populated (only when we have the XPCS.)
-        *
-        * When we do have an XPCS, we could pass state->interface, as XPCS
-        * limits to a subset of the ethtool link modes allowed here.
-        */
-       phylink_set(mac_supported, Autoneg);
-       phylink_set_port_modes(mac_supported);
-       phylink_get_linkmodes(mac_supported, PHY_INTERFACE_MODE_INTERNAL,
-                             config->mac_capabilities);
-
-       linkmode_and(supported, supported, mac_supported);
-       linkmode_and(state->advertising, state->advertising, mac_supported);
-}
-
 static void stmmac_mac_config(struct phylink_config *config, unsigned int mode,
                              const struct phylink_link_state *state)
 {
@@ -1095,7 +1072,7 @@ static void stmmac_mac_link_up(struct phylink_config *config,
 }
 
 static const struct phylink_mac_ops stmmac_phylink_mac_ops = {
-       .validate = stmmac_validate,
+       .validate = phylink_generic_validate,
        .mac_config = stmmac_mac_config,
        .mac_link_down = stmmac_mac_link_down,
        .mac_link_up = stmmac_mac_link_up,