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

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

diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index 1a96df70d1e8599a0287e748460db078411b34e4..7056d98d8177b3de1a94854e5d5bdccac7db3972 100644 (file)
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -1464,10 +1464,8 @@ static void gswip_phylink_set_capab(unsigned long *supported,
        phylink_set(mask, 100baseT_Half);
        phylink_set(mask, 100baseT_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 void gswip_xrx200_phylink_validate(struct dsa_switch *ds, int port,
@@ -1495,7 +1493,7 @@ static void gswip_xrx200_phylink_validate(struct dsa_switch *ds, int port,
                        goto unsupported;
                break;
        default:
-               bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
+               linkmode_zero(supported);
                dev_err(ds->dev, "Unsupported port: %i\n", port);
                return;
        }
@@ -1505,7 +1503,7 @@ static void gswip_xrx200_phylink_validate(struct dsa_switch *ds, int port,
        return;
 
 unsupported:
-       bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
+       linkmode_zero(supported);
        dev_err(ds->dev, "Unsupported interface '%s' for port %d\n",
                phy_modes(state->interface), port);
 }
@@ -1535,7 +1533,7 @@ static void gswip_xrx300_phylink_validate(struct dsa_switch *ds, int port,
                        goto unsupported;
                break;
        default:
-               bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
+               linkmode_zero(supported);
                dev_err(ds->dev, "Unsupported port: %i\n", port);
                return;
        }
@@ -1545,7 +1543,7 @@ static void gswip_xrx300_phylink_validate(struct dsa_switch *ds, int port,
        return;
 
 unsupported:
-       bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
+       linkmode_zero(supported);
        dev_err(ds->dev, "Unsupported interface '%s' for port %d\n",
                phy_modes(state->interface), port);
 }