1 files changed, 35 insertions, 41 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 4ba6f52943a8..391def99314c 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3043,8 +3043,7 @@ static bool ar9300_read_eeprom(struct ath_hw *ah, int address, u8 *buffer,
         int i;
 
         if ((address < 0) || ((address + count) / 2 > AR9300_EEPROM_SIZE - 1)) {
-                ath_dbg(common, ATH_DBG_EEPROM,
-                        "eeprom address not in range\n");
+                ath_dbg(common, EEPROM, "eeprom address not in range\n");
                 return false;
         }
 
@@ -3075,8 +3074,8 @@ static bool ar9300_read_eeprom(struct ath_hw *ah, int address, u8 *buffer,
         return true;
 
 error:
-        ath_dbg(common, ATH_DBG_EEPROM,
-                "unable to read eeprom region at offset %d\n", address);
+        ath_dbg(common, EEPROM, "unable to read eeprom region at offset %d\n",
+                address);
         return false;
 }
 
@@ -3160,13 +3159,13 @@ static bool ar9300_uncompress_block(struct ath_hw *ah,
                 length &= 0xff;
 
                 if (length > 0 && spot >= 0 && spot+length <= mdataSize) {
-                        ath_dbg(common, ATH_DBG_EEPROM,
+                        ath_dbg(common, EEPROM,
                                 "Restore at %d: spot=%d offset=%d length=%d\n",
                                 it, spot, offset, length);
                         memcpy(&mptr[spot], &block[it+2], length);
                         spot += length;
                 } else if (length > 0) {
-                        ath_dbg(common, ATH_DBG_EEPROM,
+                        ath_dbg(common, EEPROM,
                                 "Bad restore at %d: spot=%d offset=%d length=%d\n",
                                 it, spot, offset, length);
                         return false;
@@ -3188,13 +3187,13 @@ static int ar9300_compress_decision(struct ath_hw *ah,
         switch (code) {
         case _CompressNone:
                 if (length != mdata_size) {
-                        ath_dbg(common, ATH_DBG_EEPROM,
+                        ath_dbg(common, EEPROM,
                                 "EEPROM structure size mismatch memory=%d eeprom=%d\n",
                                 mdata_size, length);
                         return -1;
                 }
                 memcpy(mptr, (u8 *) (word + COMP_HDR_LEN), length);
-                ath_dbg(common, ATH_DBG_EEPROM,
+                ath_dbg(common, EEPROM,
                         "restored eeprom %d: uncompressed, length %d\n",
                         it, length);
                 break;
@@ -3203,22 +3202,21 @@ static int ar9300_compress_decision(struct ath_hw *ah,
                 } else {
                         eep = ar9003_eeprom_struct_find_by_id(reference);
                         if (eep == NULL) {
-                                ath_dbg(common, ATH_DBG_EEPROM,
+                                ath_dbg(common, EEPROM,
                                         "can't find reference eeprom struct %d\n",
                                         reference);
                                 return -1;
                         }
                         memcpy(mptr, eep, mdata_size);
                 }
-                ath_dbg(common, ATH_DBG_EEPROM,
+                ath_dbg(common, EEPROM,
                         "restore eeprom %d: block, reference %d, length %d\n",
                         it, reference, length);
                 ar9300_uncompress_block(ah, mptr, mdata_size,
                                         (u8 *) (word + COMP_HDR_LEN), length);
                 break;
         default:
-                ath_dbg(common, ATH_DBG_EEPROM,
-                        "unknown compression code %d\n", code);
+                ath_dbg(common, EEPROM, "unknown compression code %d\n", code);
                 return -1;
         }
         return 0;
@@ -3294,34 +3292,32 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,
                 cptr = AR9300_BASE_ADDR_512;
         else
                 cptr = AR9300_BASE_ADDR;
-        ath_dbg(common, ATH_DBG_EEPROM,
-                "Trying EEPROM access at Address 0x%04x\n", cptr);
+        ath_dbg(common, EEPROM, "Trying EEPROM access at Address 0x%04x\n",
+                cptr);
         if (ar9300_check_eeprom_header(ah, read, cptr))
                 goto found;
 
         cptr = AR9300_BASE_ADDR_512;
-        ath_dbg(common, ATH_DBG_EEPROM,
-                "Trying EEPROM access at Address 0x%04x\n", cptr);
+        ath_dbg(common, EEPROM, "Trying EEPROM access at Address 0x%04x\n",
+                cptr);
         if (ar9300_check_eeprom_header(ah, read, cptr))
                 goto found;
 
         read = ar9300_read_otp;
         cptr = AR9300_BASE_ADDR;
-        ath_dbg(common, ATH_DBG_EEPROM,
-                "Trying OTP access at Address 0x%04x\n", cptr);
+        ath_dbg(common, EEPROM, "Trying OTP access at Address 0x%04x\n", cptr);
         if (ar9300_check_eeprom_header(ah, read, cptr))
                 goto found;
 
         cptr = AR9300_BASE_ADDR_512;
-        ath_dbg(common, ATH_DBG_EEPROM,
-                "Trying OTP access at Address 0x%04x\n", cptr);
+        ath_dbg(common, EEPROM, "Trying OTP access at Address 0x%04x\n", cptr);
         if (ar9300_check_eeprom_header(ah, read, cptr))
                 goto found;
 
         goto fail;
 
 found:
-        ath_dbg(common, ATH_DBG_EEPROM, "Found valid EEPROM data\n");
+        ath_dbg(common, EEPROM, "Found valid EEPROM data\n");
 
         for (it = 0; it < MSTATE; it++) {
                 if (!read(ah, cptr, word, COMP_HDR_LEN))
@@ -3332,13 +3328,12 @@ found:
 
                 ar9300_comp_hdr_unpack(word, &code, &reference,
                                        &length, &major, &minor);
-                ath_dbg(common, ATH_DBG_EEPROM,
+                ath_dbg(common, EEPROM,
                         "Found block at %x: code=%d ref=%d length=%d major=%d minor=%d\n",
                         cptr, code, reference, length, major, minor);
                 if ((!AR_SREV_9485(ah) && length >= 1024) ||
                     (AR_SREV_9485(ah) && length > EEPROM_DATA_LEN_9485)) {
-                        ath_dbg(common, ATH_DBG_EEPROM,
-                                "Skipping bad header\n");
+                        ath_dbg(common, EEPROM, "Skipping bad header\n");
                         cptr -= COMP_HDR_LEN;
                         continue;
                 }
@@ -3347,13 +3342,13 @@ found:
                 read(ah, cptr, word, COMP_HDR_LEN + osize + COMP_CKSUM_LEN);
                 checksum = ar9300_comp_cksum(&word[COMP_HDR_LEN], length);
                 mchecksum = get_unaligned_le16(&word[COMP_HDR_LEN + osize]);
-                ath_dbg(common, ATH_DBG_EEPROM,
-                        "checksum %x %x\n", checksum, mchecksum);
+                ath_dbg(common, EEPROM, "checksum %x %x\n",
+                        checksum, mchecksum);
                 if (checksum == mchecksum) {
                         ar9300_compress_decision(ah, it, code, reference, mptr,
                                                  word, length, mdata_size);
                 } else {
-                        ath_dbg(common, ATH_DBG_EEPROM,
+                        ath_dbg(common, EEPROM,
                                 "skipping block with bad checksum\n");
                 }
                 cptr -= (COMP_HDR_LEN + osize + COMP_CKSUM_LEN);
@@ -4424,8 +4419,8 @@ static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq,
                                               is2GHz) + ht40PowerIncForPdadc;
 
         for (i = 0; i < ar9300RateSize; i++) {
-                ath_dbg(common, ATH_DBG_EEPROM,
-                        "TPC[%02d] 0x%08x\n", i, targetPowerValT2[i]);
+                ath_dbg(common, EEPROM, "TPC[%02d] 0x%08x\n",
+                        i, targetPowerValT2[i]);
         }
 }
 
@@ -4444,7 +4439,7 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,
         struct ath_common *common = ath9k_hw_common(ah);
 
         if (ichain >= AR9300_MAX_CHAINS) {
-                ath_dbg(common, ATH_DBG_EEPROM,
+                ath_dbg(common, EEPROM,
                         "Invalid chain index, must be less than %d\n",
                         AR9300_MAX_CHAINS);
                 return -1;
@@ -4452,7 +4447,7 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,
 
         if (mode) {             /* 5GHz */
                 if (ipier >= AR9300_NUM_5G_CAL_PIERS) {
-                        ath_dbg(common, ATH_DBG_EEPROM,
+                        ath_dbg(common, EEPROM,
                                 "Invalid 5GHz cal pier index, must be less than %d\n",
                                 AR9300_NUM_5G_CAL_PIERS);
                         return -1;
@@ -4462,7 +4457,7 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,
                 is2GHz = 0;
         } else {
                 if (ipier >= AR9300_NUM_2G_CAL_PIERS) {
-                        ath_dbg(common, ATH_DBG_EEPROM,
+                        ath_dbg(common, EEPROM,
                                 "Invalid 2GHz cal pier index, must be less than %d\n",
                                 AR9300_NUM_2G_CAL_PIERS);
                         return -1;
@@ -4624,8 +4619,7 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)
 
         /* interpolate  */
         for (ichain = 0; ichain < AR9300_MAX_CHAINS; ichain++) {
-                ath_dbg(common, ATH_DBG_EEPROM,
-                        "ch=%d f=%d low=%d %d h=%d %d\n",
+                ath_dbg(common, EEPROM, "ch=%d f=%d low=%d %d h=%d %d\n",
                         ichain, frequency, lfrequency[ichain],
                         lcorrection[ichain], hfrequency[ichain],
                         hcorrection[ichain]);
@@ -4680,7 +4674,7 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)
         ar9003_hw_power_control_override(ah, frequency, correction, voltage,
                                          temperature);
 
-        ath_dbg(common, ATH_DBG_EEPROM,
+        ath_dbg(common, EEPROM,
                 "for frequency=%d, calibration correction = %d %d %d\n",
                 frequency, correction[0], correction[1], correction[2]);
 
@@ -4866,7 +4860,7 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
                 else
                         freq = centers.ctl_center;
 
-                ath_dbg(common, ATH_DBG_REGULATORY,
+                ath_dbg(common, REGULATORY,
                         "LOOP-Mode ctlMode %d < %d, isHt40CtlMode %d, EXT_ADDITIVE %d\n",
                         ctlMode, numCtlModes, isHt40CtlMode,
                         (pCtlMode[ctlMode] & EXT_ADDITIVE));
@@ -4882,7 +4876,7 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
 
                 twiceMaxEdgePower = MAX_RATE_POWER;
                 for (i = 0; (i < ctlNum) && ctlIndex[i]; i++) {
-                        ath_dbg(common, ATH_DBG_REGULATORY,
+                        ath_dbg(common, REGULATORY,
                                 "LOOP-Ctlidx %d: cfgCtl 0x%2.2x pCtlMode 0x%2.2x ctlIndex 0x%2.2x chan %d\n",
                                 i, cfgCtl, pCtlMode[ctlMode], ctlIndex[i],
                                 chan->channel);
@@ -4924,7 +4918,7 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
 
                         minCtlPower = (u8)min(twiceMaxEdgePower, scaledPower);
 
-                        ath_dbg(common, ATH_DBG_REGULATORY,
+                        ath_dbg(common, REGULATORY,
                                 "SEL-Min ctlMode %d pCtlMode %d 2xMaxEdge %d sP %d minCtlPwr %d\n",
                                 ctlMode, pCtlMode[ctlMode], twiceMaxEdgePower,
                                 scaledPower, minCtlPower);
@@ -5048,7 +5042,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
                                 target_power_val_t2_eep[i]) >
                             paprd_scale_factor)) {
                                 ah->paprd_ratemask &= ~(1 << i);
-                                ath_dbg(common, ATH_DBG_EEPROM,
+                                ath_dbg(common, EEPROM,
                                         "paprd disabled for mcs %d\n", i);
                         }
                 }
@@ -5066,8 +5060,8 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
                 return;
 
         for (i = 0; i < ar9300RateSize; i++) {
-                ath_dbg(common, ATH_DBG_EEPROM,
-                        "TPC[%02d] 0x%08x\n", i, targetPowerValT2[i]);
+                ath_dbg(common, EEPROM, "TPC[%02d] 0x%08x\n",
+                        i, targetPowerValT2[i]);
         }
 
         ah->txpower_limit = regulatory->max_power_level;