aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/lo.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-02-20 13:30:10 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 14:52:53 -0500
commit3718582a663e035af5d2634cd537a012e20cdb3f (patch)
treea0f8656edeecd293cfc454c03454e8a1ed46b678 /drivers/net/wireless/b43/lo.c
parent4cf507696ae41950cd430e7534180fddd624b3cd (diff)
b43: Convert usage of b43_radio_mask()
This patch converts code to use the new b43_radio_mask() API. The semantic patch that makes this change is as follows: // <smpl> @@ expression dev, addr, mask; @@ -b43_radio_write16(dev, addr, b43_radio_read16(dev, addr) & mask); +b43_radio_mask(dev, addr, mask); // </smpl> Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/lo.c')
-rw-r--r--drivers/net/wireless/b43/lo.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c
index c5e07fc2d069..70c39bbbcf1f 100644
--- a/drivers/net/wireless/b43/lo.c
+++ b/drivers/net/wireless/b43/lo.c
@@ -231,8 +231,7 @@ static void lo_measure_txctl_values(struct b43_wldev *dev)
231 231
232 reg = lo_txctl_register_table(dev, &mask, NULL); 232 reg = lo_txctl_register_table(dev, &mask, NULL);
233 mask = ~mask; 233 mask = ~mask;
234 b43_radio_write16(dev, reg, b43_radio_read16(dev, reg) 234 b43_radio_mask(dev, reg, mask);
235 & mask);
236 235
237 if (has_tx_magnification(phy)) { 236 if (has_tx_magnification(phy)) {
238 int i, j; 237 int i, j;
@@ -269,8 +268,7 @@ static void lo_measure_txctl_values(struct b43_wldev *dev)
269 } else { 268 } else {
270 lo->tx_magn = 0; 269 lo->tx_magn = 0;
271 lo->tx_bias = 0; 270 lo->tx_bias = 0;
272 b43_radio_write16(dev, 0x52, b43_radio_read16(dev, 0x52) 271 b43_radio_mask(dev, 0x52, 0xFFF0); /* TX bias == 0 */
273 & 0xFFF0); /* TX bias == 0 */
274 } 272 }
275 lo->txctl_measured_time = jiffies; 273 lo->txctl_measured_time = jiffies;
276} 274}