diff options
author | Michael Buesch <mb@bu3sch.de> | 2009-02-20 13:22:36 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:52 -0500 |
commit | e59be0b5299ce327d67cfca737b839ef98e0da0e (patch) | |
tree | c85dc5b69d3bdeb1641ebfc7c6cd2ca67d8c143d /drivers/net/wireless/b43/lo.c | |
parent | 9b02f419a7dbd956b2c293e5cb1790b6b687f367 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/b43/lo.c')
-rw-r--r-- | drivers/net/wireless/b43/lo.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c index 88ed75f68646..c334cfd63de7 100644 --- a/drivers/net/wireless/b43/lo.c +++ b/drivers/net/wireless/b43/lo.c | |||
@@ -406,18 +406,10 @@ static void lo_measure_setup(struct b43_wldev *dev, | |||
406 | sav->phy_cck_14 = b43_phy_read(dev, B43_PHY_CCK(0x14)); | 406 | sav->phy_cck_14 = b43_phy_read(dev, B43_PHY_CCK(0x14)); |
407 | sav->phy_hpwr_tssictl = b43_phy_read(dev, B43_PHY_HPWR_TSSICTL); | 407 | sav->phy_hpwr_tssictl = b43_phy_read(dev, B43_PHY_HPWR_TSSICTL); |
408 | 408 | ||
409 | b43_phy_write(dev, B43_PHY_HPWR_TSSICTL, | 409 | b43_phy_set(dev, B43_PHY_HPWR_TSSICTL, 0x100); |
410 | b43_phy_read(dev, B43_PHY_HPWR_TSSICTL) | 410 | b43_phy_set(dev, B43_PHY_EXTG(0x01), 0x40); |
411 | | 0x100); | 411 | b43_phy_set(dev, B43_PHY_DACCTL, 0x40); |
412 | b43_phy_write(dev, B43_PHY_EXTG(0x01), | 412 | b43_phy_set(dev, B43_PHY_CCK(0x14), 0x200); |
413 | b43_phy_read(dev, B43_PHY_EXTG(0x01)) | ||
414 | | 0x40); | ||
415 | b43_phy_write(dev, B43_PHY_DACCTL, | ||
416 | b43_phy_read(dev, B43_PHY_DACCTL) | ||
417 | | 0x40); | ||
418 | b43_phy_write(dev, B43_PHY_CCK(0x14), | ||
419 | b43_phy_read(dev, B43_PHY_CCK(0x14)) | ||
420 | | 0x200); | ||
421 | } | 413 | } |
422 | if (phy->type == B43_PHYTYPE_B && | 414 | if (phy->type == B43_PHYTYPE_B && |
423 | phy->radio_ver == 0x2050 && phy->radio_rev < 6) { | 415 | phy->radio_ver == 0x2050 && phy->radio_rev < 6) { |
@@ -439,9 +431,7 @@ static void lo_measure_setup(struct b43_wldev *dev, | |||
439 | & 0xFFFC); | 431 | & 0xFFFC); |
440 | b43_phy_write(dev, B43_PHY_CRS0, b43_phy_read(dev, B43_PHY_CRS0) | 432 | b43_phy_write(dev, B43_PHY_CRS0, b43_phy_read(dev, B43_PHY_CRS0) |
441 | & 0x7FFF); | 433 | & 0x7FFF); |
442 | b43_phy_write(dev, B43_PHY_ANALOGOVER, | 434 | b43_phy_set(dev, B43_PHY_ANALOGOVER, 0x0003); |
443 | b43_phy_read(dev, B43_PHY_ANALOGOVER) | ||
444 | | 0x0003); | ||
445 | b43_phy_write(dev, B43_PHY_ANALOGOVERVAL, | 435 | b43_phy_write(dev, B43_PHY_ANALOGOVERVAL, |
446 | b43_phy_read(dev, B43_PHY_ANALOGOVERVAL) | 436 | b43_phy_read(dev, B43_PHY_ANALOGOVERVAL) |
447 | & 0xFFFC); | 437 | & 0xFFFC); |