b43: Convert usage of b43_radio_set()

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

The semantic patch that makes this change is as follows:

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

-b43_radio_write16(dev, addr, b43_radio_read16(dev, addr) | set);
+b43_radio_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, 4 deletions

diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/b43/phy_a.c
index 6845d120bc2e..b07df38d5c21 100644
--- a/drivers/net/wireless/b43/phy_a.c
+++ b/drivers/net/wireless/b43/phy_a.c
@@ -227,16 +227,14 @@ static void b43_phy_ww(struct b43_wldev *dev)
         b43_phy_mask(dev, B43_PHY_CRS0, ~B43_PHY_CRS0_EN);
         b43_phy_set(dev, B43_PHY_OFDM(0x1B), 0x1000);
         b43_phy_maskset(dev, B43_PHY_OFDM(0x82), 0xF0FF, 0x0300);
-        b43_radio_write16(dev, 0x0009,
-                b43_radio_read16(dev, 0x0009) | 0x0080);
+        b43_radio_set(dev, 0x0009, 0x0080);
         b43_radio_write16(dev, 0x0012,
                 (b43_radio_read16(dev, 0x0012) & 0xFFFC) | 0x0002);
         b43_wa_initgains(dev);
         b43_phy_write(dev, B43_PHY_OFDM(0xBA), 0x3ED5);
         b = b43_phy_read(dev, B43_PHY_PWRDOWN);
         b43_phy_write(dev, B43_PHY_PWRDOWN, (b & 0xFFF8) | 0x0005);
-        b43_radio_write16(dev, 0x0004,
-                b43_radio_read16(dev, 0x0004) | 0x0004);
+        b43_radio_set(dev, 0x0004, 0x0004);
         for (i = 0x10; i <= 0x20; i++) {
                 b43_radio_write16(dev, 0x0013, i);
                 curr_s = b43_phy_read(dev, B43_PHY_OTABLEQ) & 0x00FF;