net: convert users of bitmap_foo() to linkmode_foo()

[linux-2.6-block.git] / drivers / net / dsa / sja1105 / sja1105_main.c

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index d6788a010024ecc07357d8c38b80a2887631d1f6..c343effe2e967a84ce441fb5ce58b70bc2493f72 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -1431,7 +1431,7 @@ static void sja1105_phylink_validate(struct dsa_switch *ds, int port,
         */
        if (state->interface != PHY_INTERFACE_MODE_NA &&
            sja1105_phy_mode_mismatch(priv, port, state->interface)) {
-               bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
+               linkmode_zero(supported);
                return;
        }
 
@@ -1451,9 +1451,8 @@ static void sja1105_phylink_validate(struct dsa_switch *ds, int port,
                phylink_set(mask, 2500baseX_Full);
        }
 
-       bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);
-       bitmap_and(state->advertising, state->advertising, mask,
-                  __ETHTOOL_LINK_MODE_MASK_NBITS);
+       linkmode_and(supported, supported, mask);
+       linkmode_and(state->advertising, state->advertising, mask);
 }
 
 static int