b43: Convert usage of b43_phy_mask()

This patch converts code to use the new b43_phy_mask() API.

The semantic patch that makes this change is as follows:

// <smpl>
@@
expression dev, addr, mask;
@@

-b43_phy_write(dev, addr, b43_phy_read(dev, addr) & mask);
+b43_phy_mask(dev, addr, mask);
// </smpl>

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c
index c334cfd63de7..c5e07fc2d069 100644
--- a/drivers/net/wireless/b43/lo.c
+++ b/drivers/net/wireless/b43/lo.c
@@ -426,15 +426,10 @@ static void lo_measure_setup(struct b43_wldev *dev,
                 sav->phy_cck_3E = b43_phy_read(dev, B43_PHY_CCK(0x3E));
                 sav->phy_crs0 = b43_phy_read(dev, B43_PHY_CRS0);
 
-                b43_phy_write(dev, B43_PHY_CLASSCTL,
-                              b43_phy_read(dev, B43_PHY_CLASSCTL)
-                              & 0xFFFC);
-                b43_phy_write(dev, B43_PHY_CRS0, b43_phy_read(dev, B43_PHY_CRS0)
-                              & 0x7FFF);
+                b43_phy_mask(dev, B43_PHY_CLASSCTL, 0xFFFC);
+                b43_phy_mask(dev, B43_PHY_CRS0, 0x7FFF);
                 b43_phy_set(dev, B43_PHY_ANALOGOVER, 0x0003);
-                b43_phy_write(dev, B43_PHY_ANALOGOVERVAL,
-                              b43_phy_read(dev, B43_PHY_ANALOGOVERVAL)
-                              & 0xFFFC);
+                b43_phy_mask(dev, B43_PHY_ANALOGOVERVAL, 0xFFFC);
                 if (phy->type == B43_PHYTYPE_G) {
                         if ((phy->rev >= 7) &&
                             (sprom->boardflags_lo & B43_BFL_EXTLNA)) {