diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2010-01-17 18:21:49 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 16:49:34 -0500 |
commit | de9a47f92795f697964f662415cb27816c2d9b76 (patch) | |
tree | 22545aaf076052bc410c1efb88cc2db4dbd7efe3 /drivers/net/wireless/b43/phy_n.c | |
parent | 9145834e84805f5efcca4706edfd641047af1d55 (diff) |
b43: N-PHY: silence warnings, add missing call
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/phy_n.c')
-rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index 1359267a35ff..e77f1f24d101 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
@@ -1624,7 +1624,7 @@ static void b43_nphy_tx_cal_phy_setup(struct b43_wldev *dev) | |||
1624 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, tmp | 0x0600); | 1624 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, tmp | 0x0600); |
1625 | 1625 | ||
1626 | regs[4] = b43_phy_read(dev, B43_NPHY_BBCFG); | 1626 | regs[4] = b43_phy_read(dev, B43_NPHY_BBCFG); |
1627 | b43_phy_mask(dev, B43_NPHY_BBCFG, ~B43_NPHY_BBCFG_RSTRX); | 1627 | b43_phy_mask(dev, B43_NPHY_BBCFG, (u16)~B43_NPHY_BBCFG_RSTRX); |
1628 | 1628 | ||
1629 | tmp = b43_ntab_read(dev, B43_NTAB16(8, 3)); | 1629 | tmp = b43_ntab_read(dev, B43_NTAB16(8, 3)); |
1630 | regs[5] = tmp; | 1630 | regs[5] = tmp; |
@@ -1970,7 +1970,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev, | |||
1970 | u16 lna[3] = { 3, 3, 1 }; | 1970 | u16 lna[3] = { 3, 3, 1 }; |
1971 | u16 hpf1[3] = { 7, 2, 0 }; | 1971 | u16 hpf1[3] = { 7, 2, 0 }; |
1972 | u16 hpf2[3] = { 2, 0, 0 }; | 1972 | u16 hpf2[3] = { 2, 0, 0 }; |
1973 | u32 power[3]; | 1973 | u32 power[3] = { }; |
1974 | u16 gain_save[2]; | 1974 | u16 gain_save[2]; |
1975 | u16 cal_gain[2]; | 1975 | u16 cal_gain[2]; |
1976 | struct nphy_iqcal_params cal_params[2]; | 1976 | struct nphy_iqcal_params cal_params[2]; |
@@ -2077,7 +2077,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev, | |||
2077 | (cur_lna << 2)); | 2077 | (cur_lna << 2)); |
2078 | /* TODO:Call N PHY RF Ctrl Override with 0x400, tmp[0], | 2078 | /* TODO:Call N PHY RF Ctrl Override with 0x400, tmp[0], |
2079 | 3, 0 as arguments */ | 2079 | 3, 0 as arguments */ |
2080 | /* TODO: Call N PHY Force RF Seq with 2 as argument */ | 2080 | b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX); |
2081 | b43_nphy_stop_playback(dev); | 2081 | b43_nphy_stop_playback(dev); |
2082 | 2082 | ||
2083 | if (playtone) { | 2083 | if (playtone) { |