1 files changed, 26 insertions, 27 deletions

diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index 864a877bc05..c2b4bba7410 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -122,8 +122,8 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
         }
 
         if (!ath9k_hw_use_flash(ah)) {
-                ath_print(common, ATH_DBG_EEPROM,
-                          "Read Magic = 0x%04X\n", magic);
+                ath_dbg(common, ATH_DBG_EEPROM,
+                        "Read Magic = 0x%04X\n", magic);
 
                 if (magic != AR5416_EEPROM_MAGIC) {
                         magic2 = swab16(magic);
@@ -146,8 +146,8 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
                 }
         }
 
-        ath_print(common, ATH_DBG_EEPROM, "need_swap = %s.\n",
-                  need_swap ? "True" : "False");
+        ath_dbg(common, ATH_DBG_EEPROM, "need_swap = %s.\n",
+                need_swap ? "True" : "False");
 
         if (need_swap)
                 el = swab16(ah->eeprom.def.baseEepHeader.length);
@@ -168,8 +168,8 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
                 u32 integer, j;
                 u16 word;
 
-                ath_print(common, ATH_DBG_EEPROM,
-                          "EEPROM Endianness is not native.. Changing.\n");
+                ath_dbg(common, ATH_DBG_EEPROM,
+                        "EEPROM Endianness is not native.. Changing.\n");
 
                 word = swab16(eep->baseEepHeader.length);
                 eep->baseEepHeader.length = word;
@@ -964,20 +964,19 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
                                         ((pdadcValues[4 * j + 3] & 0xFF) << 24);
                                 REG_WRITE(ah, regOffset, reg32);
 
-                                ath_print(common, ATH_DBG_EEPROM,
-                                          "PDADC (%d,%4x): %4.4x %8.8x\n",
-                                          i, regChainOffset, regOffset,
-                                          reg32);
-                                ath_print(common, ATH_DBG_EEPROM,
-                                          "PDADC: Chain %d | PDADC %3d "
-                                          "Value %3d | PDADC %3d Value %3d | "
-                                          "PDADC %3d Value %3d | PDADC %3d "
-                                          "Value %3d |\n",
-                                          i, 4 * j, pdadcValues[4 * j],
-                                          4 * j + 1, pdadcValues[4 * j + 1],
-                                          4 * j + 2, pdadcValues[4 * j + 2],
-                                          4 * j + 3,
-                                          pdadcValues[4 * j + 3]);
+                                ath_dbg(common, ATH_DBG_EEPROM,
+                                        "PDADC (%d,%4x): %4.4x %8.8x\n",
+                                        i, regChainOffset, regOffset,
+                                        reg32);
+                                ath_dbg(common, ATH_DBG_EEPROM,
+                                        "PDADC: Chain %d | PDADC %3d "
+                                        "Value %3d | PDADC %3d Value %3d | "
+                                        "PDADC %3d Value %3d | PDADC %3d "
+                                        "Value %3d |\n",
+                                        i, 4 * j, pdadcValues[4 * j],
+                                        4 * j + 1, pdadcValues[4 * j + 1],
+                                        4 * j + 2, pdadcValues[4 * j + 2],
+                                        4 * j + 3, pdadcValues[4 * j + 3]);
 
                                 regOffset += 4;
                         }
@@ -1317,8 +1316,8 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
                 regulatory->max_power_level += INCREASE_MAXPOW_BY_THREE_CHAIN;
                 break;
         default:
-                ath_print(ath9k_hw_common(ah), ATH_DBG_EEPROM,
-                          "Invalid chainmask configuration\n");
+                ath_dbg(ath9k_hw_common(ah), ATH_DBG_EEPROM,
+                        "Invalid chainmask configuration\n");
                 break;
         }
 
@@ -1459,17 +1458,17 @@ static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
 
         u16 spur_val = AR_NO_SPUR;
 
-        ath_print(common, ATH_DBG_ANI,
-                  "Getting spur idx %d is2Ghz. %d val %x\n",
-                  i, is2GHz, ah->config.spurchans[i][is2GHz]);
+        ath_dbg(common, ATH_DBG_ANI,
+                "Getting spur idx:%d is2Ghz:%d val:%x\n",
+                i, is2GHz, ah->config.spurchans[i][is2GHz]);
 
         switch (ah->config.spurmode) {
         case SPUR_DISABLE:
                 break;
         case SPUR_ENABLE_IOCTL:
                 spur_val = ah->config.spurchans[i][is2GHz];
-                ath_print(common, ATH_DBG_ANI,
-                          "Getting spur val from new loc. %d\n", spur_val);
+                ath_dbg(common, ATH_DBG_ANI,
+                        "Getting spur val from new loc. %d\n", spur_val);
                 break;
         case SPUR_ENABLE_EEPROM:
                 spur_val = EEP_DEF_SPURCHAN;