diff options
author | Joe Perches <joe@perches.com> | 2011-12-15 17:55:53 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-12-19 14:35:31 -0500 |
commit | d2182b69dcb6a68b1ef6070b2efd094e13dea3f1 (patch) | |
tree | 92da8da22d48540d9f28b1e91ba0d1befbac5fe9 /drivers/net/wireless/ath/ath9k/ar9003_paprd.c | |
parent | a85e1d55974646a442d95911e3f7d7a891ea9ac5 (diff) |
ath: Convert ath_dbg(bar, ATH_DBG_<FOO>, to ath_dbg(bar, FOO
Add ATH_DBG_ to macros to shorten the uses and
reduce the line count.
Coalesce ath_dbg formats.
Add missing spaces to coalesced formats.
Add missing newline terminations to ath_dbg formats.
Align ath_dbg arguments where appropriate.
Standardize ath_dbg formats without periods.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_paprd.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c index a4450cba0653..59647a3ceb7f 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c | |||
@@ -119,8 +119,8 @@ static int ar9003_get_training_power_5g(struct ath_hw *ah) | |||
119 | break; | 119 | break; |
120 | default: | 120 | default: |
121 | delta = 0; | 121 | delta = 0; |
122 | ath_dbg(common, ATH_DBG_CALIBRATE, | 122 | ath_dbg(common, CALIBRATE, "Invalid tx-chainmask: %u\n", |
123 | "Invalid tx-chainmask: %u\n", ah->txchainmask); | 123 | ah->txchainmask); |
124 | } | 124 | } |
125 | 125 | ||
126 | power += delta; | 126 | power += delta; |
@@ -148,13 +148,12 @@ static int ar9003_paprd_setup_single_table(struct ath_hw *ah) | |||
148 | else | 148 | else |
149 | training_power = ar9003_get_training_power_5g(ah); | 149 | training_power = ar9003_get_training_power_5g(ah); |
150 | 150 | ||
151 | ath_dbg(common, ATH_DBG_CALIBRATE, | 151 | ath_dbg(common, CALIBRATE, "Training power: %d, Target power: %d\n", |
152 | "Training power: %d, Target power: %d\n", | ||
153 | training_power, ah->paprd_target_power); | 152 | training_power, ah->paprd_target_power); |
154 | 153 | ||
155 | if (training_power < 0) { | 154 | if (training_power < 0) { |
156 | ath_dbg(common, ATH_DBG_CALIBRATE, | 155 | ath_dbg(common, CALIBRATE, |
157 | "PAPRD target power delta out of range"); | 156 | "PAPRD target power delta out of range\n"); |
158 | return -ERANGE; | 157 | return -ERANGE; |
159 | } | 158 | } |
160 | ah->paprd_training_power = training_power; | 159 | ah->paprd_training_power = training_power; |
@@ -311,8 +310,8 @@ static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain, | |||
311 | reg_cl_gain = AR_PHY_CL_TAB_2; | 310 | reg_cl_gain = AR_PHY_CL_TAB_2; |
312 | break; | 311 | break; |
313 | default: | 312 | default: |
314 | ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE, | 313 | ath_dbg(ath9k_hw_common(ah), CALIBRATE, |
315 | "Invalid chainmask: %d\n", chain); | 314 | "Invalid chainmask: %d\n", chain); |
316 | break; | 315 | break; |
317 | } | 316 | } |
318 | 317 | ||
@@ -850,7 +849,7 @@ bool ar9003_paprd_is_done(struct ath_hw *ah) | |||
850 | agc2_pwr = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1, | 849 | agc2_pwr = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1, |
851 | AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR); | 850 | AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR); |
852 | 851 | ||
853 | ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE, | 852 | ath_dbg(ath9k_hw_common(ah), CALIBRATE, |
854 | "AGC2_PWR = 0x%x training done = 0x%x\n", | 853 | "AGC2_PWR = 0x%x training done = 0x%x\n", |
855 | agc2_pwr, paprd_done); | 854 | agc2_pwr, paprd_done); |
856 | /* | 855 | /* |