diff options
Diffstat (limited to 'drivers/net/wireless/ath5k/phy.c')
-rw-r--r-- | drivers/net/wireless/ath5k/phy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c index ee1dc0fc6ea2..890ecce8bedc 100644 --- a/drivers/net/wireless/ath5k/phy.c +++ b/drivers/net/wireless/ath5k/phy.c | |||
@@ -981,14 +981,14 @@ static unsigned int ath5k_hw_rfregs_op(u32 *rf, u32 offset, u32 reg, u32 bits, | |||
981 | entry = ((first - 1) / 8) + offset; | 981 | entry = ((first - 1) / 8) + offset; |
982 | position = (first - 1) % 8; | 982 | position = (first - 1) % 8; |
983 | 983 | ||
984 | if (set == true) | 984 | if (set) |
985 | data = ath5k_hw_bitswap(reg, bits); | 985 | data = ath5k_hw_bitswap(reg, bits); |
986 | 986 | ||
987 | for (i = shift = 0, left = bits; left > 0; position = 0, entry++, i++) { | 987 | for (i = shift = 0, left = bits; left > 0; position = 0, entry++, i++) { |
988 | last = (position + left > 8) ? 8 : position + left; | 988 | last = (position + left > 8) ? 8 : position + left; |
989 | mask = (((1 << last) - 1) ^ ((1 << position) - 1)) << (col * 8); | 989 | mask = (((1 << last) - 1) ^ ((1 << position) - 1)) << (col * 8); |
990 | 990 | ||
991 | if (set == true) { | 991 | if (set) { |
992 | rf[entry] &= ~mask; | 992 | rf[entry] &= ~mask; |
993 | rf[entry] |= ((data << position) << (col * 8)) & mask; | 993 | rf[entry] |= ((data << position) << (col * 8)) & mask; |
994 | data >>= (8 - position); | 994 | data >>= (8 - position); |
@@ -1001,7 +1001,7 @@ static unsigned int ath5k_hw_rfregs_op(u32 *rf, u32 offset, u32 reg, u32 bits, | |||
1001 | left -= 8 - position; | 1001 | left -= 8 - position; |
1002 | } | 1002 | } |
1003 | 1003 | ||
1004 | data = set == true ? 1 : ath5k_hw_bitswap(data, bits); | 1004 | data = set ? 1 : ath5k_hw_bitswap(data, bits); |
1005 | 1005 | ||
1006 | return data; | 1006 | return data; |
1007 | } | 1007 | } |
@@ -1986,7 +1986,7 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah, | |||
1986 | s32 iq_corr, i_coff, i_coffd, q_coff, q_coffd; | 1986 | s32 iq_corr, i_coff, i_coffd, q_coff, q_coffd; |
1987 | ATH5K_TRACE(ah->ah_sc); | 1987 | ATH5K_TRACE(ah->ah_sc); |
1988 | 1988 | ||
1989 | if (ah->ah_calibration == false || | 1989 | if (!ah->ah_calibration || |
1990 | ath5k_hw_reg_read(ah, AR5K_PHY_IQ) & AR5K_PHY_IQ_RUN) | 1990 | ath5k_hw_reg_read(ah, AR5K_PHY_IQ) & AR5K_PHY_IQ_RUN) |
1991 | goto done; | 1991 | goto done; |
1992 | 1992 | ||
@@ -2218,7 +2218,7 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel, | |||
2218 | AR5K_TXPOWER_CCK(13, 16) | AR5K_TXPOWER_CCK(12, 8) | | 2218 | AR5K_TXPOWER_CCK(13, 16) | AR5K_TXPOWER_CCK(12, 8) | |
2219 | AR5K_TXPOWER_CCK(11, 0), AR5K_PHY_TXPOWER_RATE4); | 2219 | AR5K_TXPOWER_CCK(11, 0), AR5K_PHY_TXPOWER_RATE4); |
2220 | 2220 | ||
2221 | if (ah->ah_txpower.txp_tpc == true) | 2221 | if (ah->ah_txpower.txp_tpc) |
2222 | ath5k_hw_reg_write(ah, AR5K_PHY_TXPOWER_RATE_MAX_TPC_ENABLE | | 2222 | ath5k_hw_reg_write(ah, AR5K_PHY_TXPOWER_RATE_MAX_TPC_ENABLE | |
2223 | AR5K_TUNE_MAX_TXPOWER, AR5K_PHY_TXPOWER_RATE_MAX); | 2223 | AR5K_TUNE_MAX_TXPOWER, AR5K_PHY_TXPOWER_RATE_MAX); |
2224 | else | 2224 | else |