ath: Convert ath_dbg(bar, ATH_DBG_<FOO>, to ath_dbg(bar, FOO

[cascardo/linux.git] / drivers / net / wireless / ath / ath9k / calib.c

diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 9953881..172e33d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -116,7 +116,7 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath_hw *ah,
                if (h[i].privNF > limit->max) {
                        high_nf_mid = true;
 
-                       ath_dbg(common, ATH_DBG_CALIBRATE,
+                       ath_dbg(common, CALIBRATE,
                                "NFmid[%d] (%d) > MAX (%d), %s\n",
                                i, h[i].privNF, limit->max,
                                (cal->nfcal_interference ?
@@ -199,8 +199,7 @@ bool ath9k_hw_reset_calvalid(struct ath_hw *ah)
                return true;
 
        if (currCal->calState != CAL_DONE) {
-               ath_dbg(common, ATH_DBG_CALIBRATE,
-                       "Calibration state incorrect, %d\n",
+               ath_dbg(common, CALIBRATE, "Calibration state incorrect, %d\n",
                        currCal->calState);
                return true;
        }
@@ -208,8 +207,7 @@ bool ath9k_hw_reset_calvalid(struct ath_hw *ah)
        if (!(ah->supp_cals & currCal->calData->calType))
                return true;
 
-       ath_dbg(common, ATH_DBG_CALIBRATE,
-               "Resetting Cal %d state for channel %u\n",
+       ath_dbg(common, CALIBRATE, "Resetting Cal %d state for channel %u\n",
                currCal->calData->calType, conf->channel->center_freq);
 
        ah->caldata->CalValid &= ~currCal->calData->calType;
@@ -302,7 +300,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
         * noisefloor until the next calibration timer.
         */
        if (j == 10000) {
-               ath_dbg(common, ATH_DBG_ANY,
+               ath_dbg(common, ANY,
                        "Timeout while waiting for nf to load: AR_PHY_AGC_CONTROL=0x%x\n",
                        REG_READ(ah, AR_PHY_AGC_CONTROL));
                return;
@@ -344,17 +342,17 @@ static void ath9k_hw_nf_sanitize(struct ath_hw *ah, s16 *nf)
                if (!nf[i])
                        continue;
 
-               ath_dbg(common, ATH_DBG_CALIBRATE,
+               ath_dbg(common, CALIBRATE,
                        "NF calibrated [%s] [chain %d] is %d\n",
                        (i >= 3 ? "ext" : "ctl"), i % 3, nf[i]);
 
                if (nf[i] > ATH9K_NF_TOO_HIGH) {
-                       ath_dbg(common, ATH_DBG_CALIBRATE,
+                       ath_dbg(common, CALIBRATE,
                                "NF[%d] (%d) > MAX (%d), correcting to MAX\n",
                                i, nf[i], ATH9K_NF_TOO_HIGH);
                        nf[i] = limit->max;
                } else if (nf[i] < limit->min) {
-                       ath_dbg(common, ATH_DBG_CALIBRATE,
+                       ath_dbg(common, CALIBRATE,
                                "NF[%d] (%d) < MIN (%d), correcting to NOM\n",
                                i, nf[i], limit->min);
                        nf[i] = limit->nominal;
@@ -373,7 +371,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
 
        chan->channelFlags &= (~CHANNEL_CW_INT);
        if (REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) {
-               ath_dbg(common, ATH_DBG_CALIBRATE,
+               ath_dbg(common, CALIBRATE,
                        "NF did not complete in calibration window\n");
                return false;
        }
@@ -383,7 +381,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
        nf = nfarray[0];
        if (ath9k_hw_get_nf_thresh(ah, c->band, &nfThresh)
            && nf > nfThresh) {
-               ath_dbg(common, ATH_DBG_CALIBRATE,
+               ath_dbg(common, CALIBRATE,
                        "noise floor failed detected; detected %d, threshold %d\n",
                        nf, nfThresh);
                chan->channelFlags |= CHANNEL_CW_INT;