b43: Convert usage of b43_phy_set()

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

The semantic patch that makes this change is as follows:

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

-b43_phy_write(dev, addr, b43_phy_read(dev, addr) | set);
+b43_phy_set(dev, addr, set);
// </smpl>

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

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/b43/wa.c
index 0c0fb15abb9f..fe7a7de046fe 100644
--- a/drivers/net/wireless/b43/wa.c
+++ b/drivers/net/wireless/b43/wa.c
@@ -318,16 +318,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);
         }
 }