1 files changed, 37 insertions, 37 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c
index 8e5e6663be35..d06c57764e11 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-calib.c
@@ -202,7 +202,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
                 val = data->nrg_silence_rssi[i];
                 silence_ref = max(silence_ref, val);
         }
-        IWL_DEBUG_CALIB("silence a %u, b %u, c %u, 20-bcn max %u\n",
+        IWL_DEBUG_CALIB(priv, "silence a %u, b %u, c %u, 20-bcn max %u\n",
                         silence_rssi_a, silence_rssi_b, silence_rssi_c,
                         silence_ref);
 
@@ -226,7 +226,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
                 max_nrg_cck = (u32) max(max_nrg_cck, (data->nrg_value[i]));
         max_nrg_cck += 6;
 
-        IWL_DEBUG_CALIB("rx energy a %u, b %u, c %u, 10-bcn max/min %u\n",
+        IWL_DEBUG_CALIB(priv, "rx energy a %u, b %u, c %u, 10-bcn max/min %u\n",
                         rx_info->beacon_energy_a, rx_info->beacon_energy_b,
                         rx_info->beacon_energy_c, max_nrg_cck - 6);
 
@@ -236,15 +236,15 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
                 data->num_in_cck_no_fa++;
         else
                 data->num_in_cck_no_fa = 0;
-        IWL_DEBUG_CALIB("consecutive bcns with few false alarms = %u\n",
+        IWL_DEBUG_CALIB(priv, "consecutive bcns with few false alarms = %u\n",
                         data->num_in_cck_no_fa);
 
         /* If we got too many false alarms this time, reduce sensitivity */
         if ((false_alarms > max_false_alarms) &&
                 (data->auto_corr_cck > AUTO_CORR_MAX_TH_CCK)) {
-                IWL_DEBUG_CALIB("norm FA %u > max FA %u\n",
+                IWL_DEBUG_CALIB(priv, "norm FA %u > max FA %u\n",
                      false_alarms, max_false_alarms);
-                IWL_DEBUG_CALIB("... reducing sensitivity\n");
+                IWL_DEBUG_CALIB(priv, "... reducing sensitivity\n");
                 data->nrg_curr_state = IWL_FA_TOO_MANY;
                 /* Store for "fewer than desired" on later beacon */
                 data->nrg_silence_ref = silence_ref;
@@ -266,7 +266,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
                 data->nrg_auto_corr_silence_diff = (s32)data->nrg_silence_ref -
                                                    (s32)silence_ref;
 
-                IWL_DEBUG_CALIB("norm FA %u < min FA %u, silence diff %d\n",
+                IWL_DEBUG_CALIB(priv, "norm FA %u < min FA %u, silence diff %d\n",
                          false_alarms, min_false_alarms,
                          data->nrg_auto_corr_silence_diff);
 
@@ -280,17 +280,17 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
                         ((data->nrg_auto_corr_silence_diff > NRG_DIFF) ||
                         (data->num_in_cck_no_fa > MAX_NUMBER_CCK_NO_FA))) {
 
-                        IWL_DEBUG_CALIB("... increasing sensitivity\n");
+                        IWL_DEBUG_CALIB(priv, "... increasing sensitivity\n");
                         /* Increase nrg value to increase sensitivity */
                         val = data->nrg_th_cck + NRG_STEP_CCK;
                         data->nrg_th_cck = min((u32)ranges->min_nrg_cck, val);
                 } else {
-                        IWL_DEBUG_CALIB("... but not changing sensitivity\n");
+                        IWL_DEBUG_CALIB(priv, "... but not changing sensitivity\n");
                 }
 
         /* Else we got a healthy number of false alarms, keep status quo */
         } else {
-                IWL_DEBUG_CALIB(" FA in safe zone\n");
+                IWL_DEBUG_CALIB(priv, " FA in safe zone\n");
                 data->nrg_curr_state = IWL_FA_GOOD_RANGE;
 
                 /* Store for use in "fewer than desired" with later beacon */
@@ -300,7 +300,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
                  *   give it some extra margin by reducing sensitivity again
                  *   (but don't go below measured energy of desired Rx) */
                 if (IWL_FA_TOO_MANY == data->nrg_prev_state) {
-                        IWL_DEBUG_CALIB("... increasing margin\n");
+                        IWL_DEBUG_CALIB(priv, "... increasing margin\n");
                         if (data->nrg_th_cck > (max_nrg_cck + NRG_MARGIN))
                                 data->nrg_th_cck -= NRG_MARGIN;
                         else
@@ -314,7 +314,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
          * Lower value is higher energy, so we use max()!
          */
         data->nrg_th_cck = max(max_nrg_cck, data->nrg_th_cck);
-        IWL_DEBUG_CALIB("new nrg_th_cck %u\n", data->nrg_th_cck);
+        IWL_DEBUG_CALIB(priv, "new nrg_th_cck %u\n", data->nrg_th_cck);
 
         data->nrg_prev_state = data->nrg_curr_state;
 
@@ -367,7 +367,7 @@ static int iwl_sens_auto_corr_ofdm(struct iwl_priv *priv,
         /* If we got too many false alarms this time, reduce sensitivity */
         if (false_alarms > max_false_alarms) {
 
-                IWL_DEBUG_CALIB("norm FA %u > max FA %u)\n",
+                IWL_DEBUG_CALIB(priv, "norm FA %u > max FA %u)\n",
                              false_alarms, max_false_alarms);
 
                 val = data->auto_corr_ofdm + AUTO_CORR_STEP_OFDM;
@@ -390,7 +390,7 @@ static int iwl_sens_auto_corr_ofdm(struct iwl_priv *priv,
         /* Else if we got fewer than desired, increase sensitivity */
         else if (false_alarms < min_false_alarms) {
 
-                IWL_DEBUG_CALIB("norm FA %u < min FA %u\n",
+                IWL_DEBUG_CALIB(priv, "norm FA %u < min FA %u\n",
                              false_alarms, min_false_alarms);
 
                 val = data->auto_corr_ofdm - AUTO_CORR_STEP_OFDM;
@@ -409,7 +409,7 @@ static int iwl_sens_auto_corr_ofdm(struct iwl_priv *priv,
                 data->auto_corr_ofdm_mrc_x1 =
                         max((u32)ranges->auto_corr_min_ofdm_mrc_x1, val);
         } else {
-                IWL_DEBUG_CALIB("min FA %u < norm FA %u < max FA %u OK\n",
+                IWL_DEBUG_CALIB(priv, "min FA %u < norm FA %u < max FA %u OK\n",
                          min_false_alarms, false_alarms, max_false_alarms);
         }
         return 0;
@@ -458,12 +458,12 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
         cmd.table[HD_OFDM_ENERGY_TH_IN_INDEX] =
                                 __constant_cpu_to_le16(62);
 
-        IWL_DEBUG_CALIB("ofdm: ac %u mrc %u x1 %u mrc_x1 %u thresh %u\n",
+        IWL_DEBUG_CALIB(priv, "ofdm: ac %u mrc %u x1 %u mrc_x1 %u thresh %u\n",
                         data->auto_corr_ofdm, data->auto_corr_ofdm_mrc,
                         data->auto_corr_ofdm_x1, data->auto_corr_ofdm_mrc_x1,
                         data->nrg_th_ofdm);
 
-        IWL_DEBUG_CALIB("cck: ac %u mrc %u thresh %u\n",
+        IWL_DEBUG_CALIB(priv, "cck: ac %u mrc %u thresh %u\n",
                         data->auto_corr_cck, data->auto_corr_cck_mrc,
                         data->nrg_th_cck);
 
@@ -473,7 +473,7 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
         /* Don't send command to uCode if nothing has changed */
         if (!memcmp(&cmd.table[0], &(priv->sensitivity_tbl[0]),
                     sizeof(u16)*HD_TABLE_SIZE)) {
-                IWL_DEBUG_CALIB("No change in SENSITIVITY_CMD\n");
+                IWL_DEBUG_CALIB(priv, "No change in SENSITIVITY_CMD\n");
                 return 0;
         }
 
@@ -498,7 +498,7 @@ void iwl_init_sensitivity(struct iwl_priv *priv)
         if (priv->disable_sens_cal)
                 return;
 
-        IWL_DEBUG_CALIB("Start iwl_init_sensitivity\n");
+        IWL_DEBUG_CALIB(priv, "Start iwl_init_sensitivity\n");
 
         /* Clear driver's sensitivity algo data */
         data = &(priv->sensitivity_data);
@@ -536,7 +536,7 @@ void iwl_init_sensitivity(struct iwl_priv *priv)
         data->last_fa_cnt_cck = 0;
 
         ret |= iwl_sensitivity_write(priv);
-        IWL_DEBUG_CALIB("<<return 0x%X\n", ret);
+        IWL_DEBUG_CALIB(priv, "<<return 0x%X\n", ret);
 }
 EXPORT_SYMBOL(iwl_init_sensitivity);
 
@@ -562,13 +562,13 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
         data = &(priv->sensitivity_data);
 
         if (!iwl_is_associated(priv)) {
-                IWL_DEBUG_CALIB("<< - not associated\n");
+                IWL_DEBUG_CALIB(priv, "<< - not associated\n");
                 return;
         }
 
         spin_lock_irqsave(&priv->lock, flags);
         if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
-                IWL_DEBUG_CALIB("<< invalid data.\n");
+                IWL_DEBUG_CALIB(priv, "<< invalid data.\n");
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return;
         }
@@ -595,10 +595,10 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        IWL_DEBUG_CALIB("rx_enable_time = %u usecs\n", rx_enable_time);
+        IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time);
 
         if (!rx_enable_time) {
-                IWL_DEBUG_CALIB("<< RX Enable Time == 0! \n");
+                IWL_DEBUG_CALIB(priv, "<< RX Enable Time == 0! \n");
                 return;
         }
 
@@ -637,7 +637,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
         norm_fa_ofdm = fa_ofdm + bad_plcp_ofdm;
         norm_fa_cck = fa_cck + bad_plcp_cck;
 
-        IWL_DEBUG_CALIB("cck: fa %u badp %u  ofdm: fa %u badp %u\n", fa_cck,
+        IWL_DEBUG_CALIB(priv, "cck: fa %u badp %u  ofdm: fa %u badp %u\n", fa_cck,
                         bad_plcp_cck, fa_ofdm, bad_plcp_ofdm);
 
         iwl_sens_auto_corr_ofdm(priv, norm_fa_ofdm, rx_enable_time);
@@ -690,13 +690,13 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
          *   then we're done forever. */
         if (data->state != IWL_CHAIN_NOISE_ACCUMULATE) {
                 if (data->state == IWL_CHAIN_NOISE_ALIVE)
-                        IWL_DEBUG_CALIB("Wait for noise calib reset\n");
+                        IWL_DEBUG_CALIB(priv, "Wait for noise calib reset\n");
                 return;
         }
 
         spin_lock_irqsave(&priv->lock, flags);
         if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
-                IWL_DEBUG_CALIB(" << Interference data unavailable\n");
+                IWL_DEBUG_CALIB(priv, " << Interference data unavailable\n");
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return;
         }
@@ -709,7 +709,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
         /* Make sure we accumulate data for just the associated channel
          *   (even if scanning). */
         if ((rxon_chnum != stat_chnum) || (rxon_band24 != stat_band24)) {
-                IWL_DEBUG_CALIB("Stats not from chan=%d, band24=%d\n",
+                IWL_DEBUG_CALIB(priv, "Stats not from chan=%d, band24=%d\n",
                                 rxon_chnum, rxon_band24);
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return;
@@ -739,11 +739,11 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
         data->chain_signal_b = (chain_sig_b + data->chain_signal_b);
         data->chain_signal_c = (chain_sig_c + data->chain_signal_c);
 
-        IWL_DEBUG_CALIB("chan=%d, band24=%d, beacon=%d\n",
+        IWL_DEBUG_CALIB(priv, "chan=%d, band24=%d, beacon=%d\n",
                         rxon_chnum, rxon_band24, data->beacon_count);
-        IWL_DEBUG_CALIB("chain_sig: a %d b %d c %d\n",
+        IWL_DEBUG_CALIB(priv, "chain_sig: a %d b %d c %d\n",
                         chain_sig_a, chain_sig_b, chain_sig_c);
-        IWL_DEBUG_CALIB("chain_noise: a %d b %d c %d\n",
+        IWL_DEBUG_CALIB(priv, "chain_noise: a %d b %d c %d\n",
                         chain_noise_a, chain_noise_b, chain_noise_c);
 
         /* If this is the 20th beacon, determine:
@@ -773,9 +773,9 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                 active_chains = (1 << max_average_sig_antenna_i);
         }
 
-        IWL_DEBUG_CALIB("average_sig: a %d b %d c %d\n",
+        IWL_DEBUG_CALIB(priv, "average_sig: a %d b %d c %d\n",
                      average_sig[0], average_sig[1], average_sig[2]);
-        IWL_DEBUG_CALIB("max_average_sig = %d, antenna %d\n",
+        IWL_DEBUG_CALIB(priv, "max_average_sig = %d, antenna %d\n",
                      max_average_sig, max_average_sig_antenna_i);
 
         /* Compare signal strengths for all 3 receivers. */
@@ -789,7 +789,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                                 data->disconn_array[i] = 1;
                         else
                                 active_chains |= (1 << i);
-                        IWL_DEBUG_CALIB("i = %d  rssiDelta = %d  "
+                        IWL_DEBUG_CALIB(priv, "i = %d  rssiDelta = %d  "
                              "disconn_array[i] = %d\n",
                              i, rssi_delta, data->disconn_array[i]);
                 }
@@ -813,7 +813,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                          * disconnected connect it anyway */
                         data->disconn_array[i] = 0;
                         active_chains |= ant_msk;
-                        IWL_DEBUG_CALIB("All Tx chains are disconnected W/A - "
+                        IWL_DEBUG_CALIB(priv, "All Tx chains are disconnected W/A - "
                                 "declare %d as connected\n", i);
                         break;
                 }
@@ -821,7 +821,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
 
         /* Save for use within RXON, TX, SCAN commands, etc. */
         priv->chain_noise_data.active_chains = active_chains;
-        IWL_DEBUG_CALIB("active_chains (bitwise) = 0x%x\n",
+        IWL_DEBUG_CALIB(priv, "active_chains (bitwise) = 0x%x\n",
                         active_chains);
 
         /* Analyze noise for rx balance */
@@ -839,11 +839,11 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                 }
         }
 
-        IWL_DEBUG_CALIB("average_noise: a %d b %d c %d\n",
+        IWL_DEBUG_CALIB(priv, "average_noise: a %d b %d c %d\n",
                         average_noise[0], average_noise[1],
                         average_noise[2]);
 
-        IWL_DEBUG_CALIB("min_average_noise = %d, antenna %d\n",
+        IWL_DEBUG_CALIB(priv, "min_average_noise = %d, antenna %d\n",
                         min_average_noise, min_average_noise_antenna_i);
 
         priv->cfg->ops->utils->gain_computation(priv, average_noise,