diff options
author | Michael Buesch <mb@bu3sch.de> | 2009-02-20 13:30:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:53 -0500 |
commit | 3718582a663e035af5d2634cd537a012e20cdb3f (patch) | |
tree | a0f8656edeecd293cfc454c03454e8a1ed46b678 /drivers/net/wireless/b43/phy_a.c | |
parent | 4cf507696ae41950cd430e7534180fddd624b3cd (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/phy_a.c')
-rw-r--r-- | drivers/net/wireless/b43/phy_a.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/b43/phy_a.c index b07df38d5c2..4f052ebf06d 100644 --- a/drivers/net/wireless/b43/phy_a.c +++ b/drivers/net/wireless/b43/phy_a.c | |||
@@ -134,12 +134,10 @@ static void aphy_channel_switch(struct b43_wldev *dev, unsigned int channel) | |||
134 | b43_radio_write16(dev, 0x003A, (b43_radio_read16(dev, 0x003A) | 134 | b43_radio_write16(dev, 0x003A, (b43_radio_read16(dev, 0x003A) |
135 | & 0xFF20) | | 135 | & 0xFF20) | |
136 | freq_r3A_value(freq)); | 136 | freq_r3A_value(freq)); |
137 | b43_radio_write16(dev, 0x003D, | 137 | b43_radio_mask(dev, 0x003D, 0x00FF); |
138 | b43_radio_read16(dev, 0x003D) & 0x00FF); | ||
139 | b43_radio_write16(dev, 0x0081, (b43_radio_read16(dev, 0x0081) | 138 | b43_radio_write16(dev, 0x0081, (b43_radio_read16(dev, 0x0081) |
140 | & 0xFF7F) | 0x0080); | 139 | & 0xFF7F) | 0x0080); |
141 | b43_radio_write16(dev, 0x0035, | 140 | b43_radio_mask(dev, 0x0035, 0xFFEF); |
142 | b43_radio_read16(dev, 0x0035) & 0xFFEF); | ||
143 | b43_radio_write16(dev, 0x0035, (b43_radio_read16(dev, 0x0035) | 141 | b43_radio_write16(dev, 0x0035, (b43_radio_read16(dev, 0x0035) |
144 | & 0xFFEF) | 0x0010); | 142 | & 0xFFEF) | 0x0010); |
145 | b43_radio_set_tx_iq(dev); | 143 | b43_radio_set_tx_iq(dev); |
@@ -160,10 +158,10 @@ static void b43_radio_init2060(struct b43_wldev *dev) | |||
160 | b43_radio_write16(dev, 0x0082, 0x0080); | 158 | b43_radio_write16(dev, 0x0082, 0x0080); |
161 | b43_radio_write16(dev, 0x0080, 0x0000); | 159 | b43_radio_write16(dev, 0x0080, 0x0000); |
162 | b43_radio_write16(dev, 0x003F, 0x00DA); | 160 | b43_radio_write16(dev, 0x003F, 0x00DA); |
163 | b43_radio_write16(dev, 0x0005, b43_radio_read16(dev, 0x0005) & ~0x0008); | 161 | b43_radio_mask(dev, 0x0005, ~0x0008); |
164 | b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) & ~0x0010); | 162 | b43_radio_mask(dev, 0x0081, ~0x0010); |
165 | b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) & ~0x0020); | 163 | b43_radio_mask(dev, 0x0081, ~0x0020); |
166 | b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) & ~0x0020); | 164 | b43_radio_mask(dev, 0x0081, ~0x0020); |
167 | msleep(1); /* delay 400usec */ | 165 | msleep(1); /* delay 400usec */ |
168 | 166 | ||
169 | b43_radio_write16(dev, 0x0081, | 167 | b43_radio_write16(dev, 0x0081, |
@@ -172,9 +170,9 @@ static void b43_radio_init2060(struct b43_wldev *dev) | |||
172 | 170 | ||
173 | b43_radio_write16(dev, 0x0005, | 171 | b43_radio_write16(dev, 0x0005, |
174 | (b43_radio_read16(dev, 0x0005) & ~0x0008) | 0x0008); | 172 | (b43_radio_read16(dev, 0x0005) & ~0x0008) | 0x0008); |
175 | b43_radio_write16(dev, 0x0085, b43_radio_read16(dev, 0x0085) & ~0x0010); | 173 | b43_radio_mask(dev, 0x0085, ~0x0010); |
176 | b43_radio_write16(dev, 0x0005, b43_radio_read16(dev, 0x0005) & ~0x0008); | 174 | b43_radio_mask(dev, 0x0005, ~0x0008); |
177 | b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) & ~0x0040); | 175 | b43_radio_mask(dev, 0x0081, ~0x0040); |
178 | b43_radio_write16(dev, 0x0081, | 176 | b43_radio_write16(dev, 0x0081, |
179 | (b43_radio_read16(dev, 0x0081) & ~0x0040) | 0x0040); | 177 | (b43_radio_read16(dev, 0x0081) & ~0x0040) | 0x0040); |
180 | b43_radio_write16(dev, 0x0005, | 178 | b43_radio_write16(dev, 0x0005, |
@@ -247,8 +245,7 @@ static void b43_phy_ww(struct b43_wldev *dev) | |||
247 | best_s = curr_s; | 245 | best_s = curr_s; |
248 | } | 246 | } |
249 | b43_phy_write(dev, B43_PHY_PWRDOWN, b); | 247 | b43_phy_write(dev, B43_PHY_PWRDOWN, b); |
250 | b43_radio_write16(dev, 0x0004, | 248 | b43_radio_mask(dev, 0x0004, 0xFFFB); |
251 | b43_radio_read16(dev, 0x0004) & 0xFFFB); | ||
252 | b43_radio_write16(dev, 0x0013, best_s); | 249 | b43_radio_write16(dev, 0x0013, best_s); |
253 | b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1_R1, 0, 0xFFEC); | 250 | b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1_R1, 0, 0xFFEC); |
254 | b43_phy_write(dev, B43_PHY_OFDM(0xB7), 0x1E80); | 251 | b43_phy_write(dev, B43_PHY_OFDM(0xB7), 0x1E80); |