net: stmmac: Switch to linkmode_and()/linkmode_andnot()

Use the linkmode_and()/linkmode_andnot() helpers to simplify the code.

Signed-off-by: Jose Abreu <Jose.Abreu@synopsys.com>
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 cb7a5bad4cfe88269f00b5c5f811c158468ad15f..cf184241b85e9a58a589a8c7a48801465e7ad5ce 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -858,14 +858,11 @@ static void stmmac_validate(struct phylink_config *config,
                phylink_set(mask, 1000baseT_Half);
        }
 
-       bitmap_and(supported, supported, mac_supported,
-                  __ETHTOOL_LINK_MODE_MASK_NBITS);
-       bitmap_andnot(supported, supported, mask,
-                     __ETHTOOL_LINK_MODE_MASK_NBITS);
-       bitmap_and(state->advertising, state->advertising, mac_supported,
-                  __ETHTOOL_LINK_MODE_MASK_NBITS);
-       bitmap_andnot(state->advertising, state->advertising, mask,
-                     __ETHTOOL_LINK_MODE_MASK_NBITS);
+       linkmode_and(supported, supported, mac_supported);
+       linkmode_andnot(supported, supported, mask);
+
+       linkmode_and(state->advertising, state->advertising, mac_supported);
+       linkmode_andnot(state->advertising, state->advertising, mask);
 }
 
 static void stmmac_mac_pcs_get_state(struct phylink_config *config,