net: axienet: use phylink_generic_validate()

axienet has no special behaviour in its validation implementation, so
can be switched to phylink_generic_validate().

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/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index a058019ad9a174f25747edcba63d1b42157b7908..3dabc1901416a768c554589ddd9cc64dca6f7666 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1503,43 +1503,6 @@ static const struct ethtool_ops axienet_ethtool_ops = {
        .nway_reset     = axienet_ethtools_nway_reset,
 };
 
-static void axienet_validate(struct phylink_config *config,
-                            unsigned long *supported,
-                            struct phylink_link_state *state)
-{
-       __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
-
-       phylink_set(mask, Autoneg);
-       phylink_set_port_modes(mask);
-
-       phylink_set(mask, Asym_Pause);
-       phylink_set(mask, Pause);
-
-       switch (state->interface) {
-       case PHY_INTERFACE_MODE_1000BASEX:
-       case PHY_INTERFACE_MODE_SGMII:
-       case PHY_INTERFACE_MODE_GMII:
-       case PHY_INTERFACE_MODE_RGMII:
-       case PHY_INTERFACE_MODE_RGMII_ID:
-       case PHY_INTERFACE_MODE_RGMII_RXID:
-       case PHY_INTERFACE_MODE_RGMII_TXID:
-               phylink_set(mask, 1000baseX_Full);
-               phylink_set(mask, 1000baseT_Full);
-               if (state->interface == PHY_INTERFACE_MODE_1000BASEX)
-                       break;
-               fallthrough;
-       case PHY_INTERFACE_MODE_MII:
-               phylink_set(mask, 100baseT_Full);
-               phylink_set(mask, 10baseT_Full);
-               fallthrough;
-       default:
-               break;
-       }
-
-       linkmode_and(supported, supported, mask);
-       linkmode_and(state->advertising, state->advertising, mask);
-}
-
 static void axienet_mac_pcs_get_state(struct phylink_config *config,
                                      struct phylink_link_state *state)
 {
@@ -1665,7 +1628,7 @@ static void axienet_mac_link_up(struct phylink_config *config,
 }
 
 static const struct phylink_mac_ops axienet_phylink_ops = {
-       .validate = axienet_validate,
+       .validate = phylink_generic_validate,
        .mac_pcs_get_state = axienet_mac_pcs_get_state,
        .mac_an_restart = axienet_mac_an_restart,
        .mac_prepare = axienet_mac_prepare,
@@ -2082,6 +2045,8 @@ static int axienet_probe(struct platform_device *pdev)
 
        lp->phylink_config.dev = &ndev->dev;
        lp->phylink_config.type = PHYLINK_NETDEV;
+       lp->phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE |
+               MAC_10FD | MAC_100FD | MAC_1000FD;
 
        __set_bit(lp->phy_mode, lp->phylink_config.supported_interfaces);
        if (lp->switch_x_sgmii) {