From: Jose Abreu Date: Mon, 9 Mar 2020 08:36:21 +0000 (+0100) Subject: net: stmmac: Switch to linkmode_and()/linkmode_andnot() X-Git-Tag: v5.7-rc1~146^2~211^2~6 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=422829f9f8dbe677d1f9edc0bf1fd679d3f10c25;p=tomoyo%2Ftomoyo-test1.git net: stmmac: Switch to linkmode_and()/linkmode_andnot() Use the linkmode_and()/linkmode_andnot() helpers to simplify the code. Signed-off-by: Jose Abreu Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index cb7a5bad4cfe..cf184241b85e 100644 --- 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,