b43: Convert usage of b43_phy_mask()

[mv-sheeva.git] / drivers / net / wireless / b43 / wa.c

diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/b43/wa.c
index 0c0fb15abb9f0fabfcf89d034fde3e20116f940a..701dff84e997c337916f2c21d8190a616be3a3ec 100644 (file)
--- a/drivers/net/wireless/b43/wa.c
+++ b/drivers/net/wireless/b43/wa.c
@@ -62,8 +62,7 @@ void b43_wa_initgains(struct b43_wldev *dev)
        struct b43_phy *phy = &dev->phy;
 
        b43_phy_write(dev, B43_PHY_LNAHPFCTL, 0x1FF9);
-       b43_phy_write(dev, B43_PHY_LPFGAINCTL,
-               b43_phy_read(dev, B43_PHY_LPFGAINCTL) & 0xFF0F);
+       b43_phy_mask(dev, B43_PHY_LPFGAINCTL, 0xFF0F);
        if (phy->rev <= 2)
                b43_ofdmtab_write16(dev, B43_OFDMTAB_LPFGAIN, 0, 0x1FBF);
        b43_radio_write16(dev, 0x0002, 0x1FBF);
@@ -86,7 +85,7 @@ void b43_wa_initgains(struct b43_wldev *dev)
 
 static void b43_wa_divider(struct b43_wldev *dev)
 {
-       b43_phy_write(dev, 0x002B, b43_phy_read(dev, 0x002B) & ~0x0100);
+       b43_phy_mask(dev, 0x002B, ~0x0100);
        b43_phy_write(dev, 0x008E, 0x58C1);
 }
 
@@ -318,16 +317,12 @@ static void b43_wa_crs_ed(struct b43_wldev *dev)
        } else if (phy->rev == 2) {
                b43_phy_write(dev, B43_PHY_CRSTHRES1, 0x1861);
                b43_phy_write(dev, B43_PHY_CRSTHRES2, 0x0271);
-               b43_phy_write(dev, B43_PHY_ANTDWELL,
-                                 b43_phy_read(dev, B43_PHY_ANTDWELL)
-                                 | 0x0800);
+               b43_phy_set(dev, B43_PHY_ANTDWELL, 0x0800);
        } else {
                b43_phy_write(dev, B43_PHY_CRSTHRES1, 0x0098);
                b43_phy_write(dev, B43_PHY_CRSTHRES2, 0x0070);
                b43_phy_write(dev, B43_PHY_OFDM(0xC9), 0x0080);
-               b43_phy_write(dev, B43_PHY_ANTDWELL,
-                                 b43_phy_read(dev, B43_PHY_ANTDWELL)
-                                 | 0x0800);
+               b43_phy_set(dev, B43_PHY_ANTDWELL, 0x0800);
        }
 }
 
@@ -437,8 +432,7 @@ static void b43_wa_altagc(struct b43_wldev *dev)
                b43_phy_write(dev, B43_PHY_OFDM(0x1B),
                        (b43_phy_read(dev, B43_PHY_OFDM(0x1B)) & ~0x001E) | 0x0002);
        } else {
-               b43_phy_write(dev, B43_PHY_OFDM(0x1B),
-                       b43_phy_read(dev, B43_PHY_OFDM(0x1B)) & ~0x001E);
+               b43_phy_mask(dev, B43_PHY_OFDM(0x1B), ~0x001E);
                b43_phy_write(dev, B43_PHY_OFDM(0x1F), 0x287A);
                b43_phy_write(dev, B43_PHY_LPFGAINCTL,
                        (b43_phy_read(dev, B43_PHY_LPFGAINCTL) & ~0x000F) | 0x0004);
@@ -469,10 +463,8 @@ static void b43_wa_altagc(struct b43_wldev *dev)
                b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC3, 3, 28);
        }
        if (phy->rev >= 6) {
-               b43_phy_write(dev, B43_PHY_OFDM(0x26),
-                       b43_phy_read(dev, B43_PHY_OFDM(0x26)) & ~0x0003);
-               b43_phy_write(dev, B43_PHY_OFDM(0x26),
-                       b43_phy_read(dev, B43_PHY_OFDM(0x26)) & ~0x1000);
+               b43_phy_mask(dev, B43_PHY_OFDM(0x26), ~0x0003);
+               b43_phy_mask(dev, B43_PHY_OFDM(0x26), ~0x1000);
        }
        b43_phy_read(dev, B43_PHY_VERSION_OFDM); /* Dummy read */
 }
@@ -538,8 +530,7 @@ static void b43_wa_boards_g(struct b43_wldev *dev)
                        b43_ofdmtab_write16(dev, B43_OFDMTAB_GAINX, 2, 0x0001);
                        if ((bus->sprom.boardflags_lo & B43_BFL_EXTLNA) &&
                            (phy->rev >= 7)) {
-                               b43_phy_write(dev, B43_PHY_EXTG(0x11),
-                                       b43_phy_read(dev, B43_PHY_EXTG(0x11)) & 0xF7FF);
+                               b43_phy_mask(dev, B43_PHY_EXTG(0x11), 0xF7FF);
                                b43_ofdmtab_write16(dev, B43_OFDMTAB_GAINX, 0x0020, 0x0001);
                                b43_ofdmtab_write16(dev, B43_OFDMTAB_GAINX, 0x0021, 0x0001);
                                b43_ofdmtab_write16(dev, B43_OFDMTAB_GAINX, 0x0022, 0x0001);