1 files changed, 33 insertions, 32 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
index 988ee454a944..84cbe7bb504c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
@@ -68,13 +68,19 @@
 #include "iwl-agn-calib.h"
 #include "iwl-trans.h"
 #include "iwl-agn.h"
-#include "iwl-wifi.h"
-#include "iwl-ucode.h"
 
 /*****************************************************************************
  * INIT calibrations framework
  *****************************************************************************/
 
+/* Opaque calibration results */
+struct iwl_calib_result {
+        struct list_head list;
+        size_t cmd_len;
+        struct iwl_calib_hdr hdr;
+        /* data follows */
+};
+
 struct statistics_general_data {
         u32 beacon_silence_rssi_a;
         u32 beacon_silence_rssi_b;
@@ -84,7 +90,7 @@ struct statistics_general_data {
         u32 beacon_energy_c;
 };
 
-int iwl_send_calib_results(struct iwl_trans *trans)
+int iwl_send_calib_results(struct iwl_priv *priv)
 {
         struct iwl_host_cmd hcmd = {
                 .id = REPLY_PHY_CALIBRATION_CMD,
@@ -92,15 +98,15 @@ int iwl_send_calib_results(struct iwl_trans *trans)
         };
         struct iwl_calib_result *res;
 
-        list_for_each_entry(res, &trans->calib_results, list) {
+        list_for_each_entry(res, &priv->calib_results, list) {
                 int ret;
 
                 hcmd.len[0] = res->cmd_len;
                 hcmd.data[0] = &res->hdr;
                 hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;
-                ret = iwl_trans_send_cmd(trans, &hcmd);
+                ret = iwl_dvm_send_cmd(priv, &hcmd);
                 if (ret) {
-                        IWL_ERR(trans, "Error %d on calib cmd %d\n",
+                        IWL_ERR(priv, "Error %d on calib cmd %d\n",
                                 ret, res->hdr.op_code);
                         return ret;
                 }
@@ -109,7 +115,7 @@ int iwl_send_calib_results(struct iwl_trans *trans)
         return 0;
 }
 
-int iwl_calib_set(struct iwl_trans *trans,
+int iwl_calib_set(struct iwl_priv *priv,
                   const struct iwl_calib_hdr *cmd, int len)
 {
         struct iwl_calib_result *res, *tmp;
@@ -121,7 +127,7 @@ int iwl_calib_set(struct iwl_trans *trans,
         memcpy(&res->hdr, cmd, len);
         res->cmd_len = len;
 
-        list_for_each_entry(tmp, &trans->calib_results, list) {
+        list_for_each_entry(tmp, &priv->calib_results, list) {
                 if (tmp->hdr.op_code == res->hdr.op_code) {
                         list_replace(&tmp->list, &res->list);
                         kfree(tmp);
@@ -130,16 +136,16 @@ int iwl_calib_set(struct iwl_trans *trans,
         }
 
         /* wasn't in list already */
-        list_add_tail(&res->list, &trans->calib_results);
+        list_add_tail(&res->list, &priv->calib_results);
 
         return 0;
 }
 
-void iwl_calib_free_results(struct iwl_trans *trans)
+void iwl_calib_free_results(struct iwl_priv *priv)
 {
         struct iwl_calib_result *res, *tmp;
 
-        list_for_each_entry_safe(res, tmp, &trans->calib_results, list) {
+        list_for_each_entry_safe(res, tmp, &priv->calib_results, list) {
                 list_del(&res->list);
                 kfree(res);
         }
@@ -494,7 +500,7 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
         memcpy(&(priv->sensitivity_tbl[0]), &(cmd.table[0]),
                sizeof(u16)*HD_TABLE_SIZE);
 
-        return iwl_trans_send_cmd(trans(priv), &cmd_out);
+        return iwl_dvm_send_cmd(priv, &cmd_out);
 }
 
 /* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */
@@ -583,7 +589,7 @@ static int iwl_enhance_sensitivity_write(struct iwl_priv *priv)
                &(cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX]),
                sizeof(u16)*ENHANCE_HD_TABLE_ENTRIES);
 
-        return iwl_trans_send_cmd(trans(priv), &cmd_out);
+        return iwl_dvm_send_cmd(priv, &cmd_out);
 }
 
 void iwl_init_sensitivity(struct iwl_priv *priv)
@@ -636,7 +642,7 @@ void iwl_init_sensitivity(struct iwl_priv *priv)
         data->last_bad_plcp_cnt_cck = 0;
         data->last_fa_cnt_cck = 0;
 
-        if (nic(priv)->fw.enhance_sensitivity_table)
+        if (priv->fw->enhance_sensitivity_table)
                 ret |= iwl_enhance_sensitivity_write(priv);
         else
                 ret |= iwl_sensitivity_write(priv);
@@ -655,7 +661,6 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv)
         struct iwl_sensitivity_data *data = NULL;
         struct statistics_rx_non_phy *rx_info;
         struct statistics_rx_phy *ofdm, *cck;
-        unsigned long flags;
         struct statistics_general_data statis;
 
         if (priv->disable_sens_cal)
@@ -668,13 +673,13 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv)
                 return;
         }
 
-        spin_lock_irqsave(&priv->shrd->lock, flags);
+        spin_lock_bh(&priv->statistics.lock);
         rx_info = &priv->statistics.rx_non_phy;
         ofdm = &priv->statistics.rx_ofdm;
         cck = &priv->statistics.rx_cck;
         if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
                 IWL_DEBUG_CALIB(priv, "<< invalid data.\n");
-                spin_unlock_irqrestore(&priv->shrd->lock, flags);
+                spin_unlock_bh(&priv->statistics.lock);
                 return;
         }
 
@@ -698,7 +703,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv)
         statis.beacon_energy_c =
                         le32_to_cpu(rx_info->beacon_energy_c);
 
-        spin_unlock_irqrestore(&priv->shrd->lock, flags);
+        spin_unlock_bh(&priv->statistics.lock);
 
         IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time);
 
@@ -747,7 +752,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv)
 
         iwl_sens_auto_corr_ofdm(priv, norm_fa_ofdm, rx_enable_time);
         iwl_sens_energy_cck(priv, norm_fa_cck, rx_enable_time, &statis);
-        if (nic(priv)->fw.enhance_sensitivity_table)
+        if (priv->fw->enhance_sensitivity_table)
                 iwl_enhance_sensitivity_write(priv);
         else
                 iwl_sensitivity_write(priv);
@@ -849,7 +854,7 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
                          * connect the first valid tx chain
                          */
                         first_chain =
-                                find_first_chain(cfg(priv)->valid_tx_ant);
+                                find_first_chain(hw_params(priv).valid_tx_ant);
                         data->disconn_array[first_chain] = 0;
                         active_chains |= BIT(first_chain);
                         IWL_DEBUG_CALIB(priv,
@@ -874,10 +879,8 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
 }
 
 static void iwlagn_gain_computation(struct iwl_priv *priv,
-                u32 average_noise[NUM_RX_CHAINS],
-                u16 min_average_noise_antenna_i,
-                u32 min_average_noise,
-                u8 default_chain)
+                                    u32 average_noise[NUM_RX_CHAINS],
+                                    u8 default_chain)
 {
         int i;
         s32 delta_g;
@@ -925,7 +928,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv,
                         priv->phy_calib_chain_noise_gain_cmd);
                 cmd.delta_gain_1 = data->delta_gain_code[1];
                 cmd.delta_gain_2 = data->delta_gain_code[2];
-                iwl_trans_send_cmd_pdu(trans(priv), REPLY_PHY_CALIBRATION_CMD,
+                iwl_dvm_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
                         CMD_ASYNC, sizeof(cmd), &cmd);
 
                 data->radio_write = 1;
@@ -958,7 +961,6 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
         u16 stat_chnum = INITIALIZATION_VALUE;
         u8 rxon_band24;
         u8 stat_band24;
-        unsigned long flags;
         struct statistics_rx_non_phy *rx_info;
 
         /*
@@ -983,13 +985,13 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
                 return;
         }
 
-        spin_lock_irqsave(&priv->shrd->lock, flags);
+        spin_lock_bh(&priv->statistics.lock);
 
         rx_info = &priv->statistics.rx_non_phy;
 
         if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
                 IWL_DEBUG_CALIB(priv, " << Interference data unavailable\n");
-                spin_unlock_irqrestore(&priv->shrd->lock, flags);
+                spin_unlock_bh(&priv->statistics.lock);
                 return;
         }
 
@@ -1004,7 +1006,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
         if ((rxon_chnum != stat_chnum) || (rxon_band24 != stat_band24)) {
                 IWL_DEBUG_CALIB(priv, "Stats not from chan=%d, band24=%d\n",
                                 rxon_chnum, rxon_band24);
-                spin_unlock_irqrestore(&priv->shrd->lock, flags);
+                spin_unlock_bh(&priv->statistics.lock);
                 return;
         }
 
@@ -1023,7 +1025,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
         chain_sig_b = le32_to_cpu(rx_info->beacon_rssi_b) & IN_BAND_FILTER;
         chain_sig_c = le32_to_cpu(rx_info->beacon_rssi_c) & IN_BAND_FILTER;
 
-        spin_unlock_irqrestore(&priv->shrd->lock, flags);
+        spin_unlock_bh(&priv->statistics.lock);
 
         data->beacon_count++;
 
@@ -1083,8 +1085,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
                         min_average_noise, min_average_noise_antenna_i);
 
         iwlagn_gain_computation(priv, average_noise,
-                                min_average_noise_antenna_i, min_average_noise,
-                                find_first_chain(cfg(priv)->valid_rx_ant));
+                                find_first_chain(hw_params(priv).valid_rx_ant));
 
         /* Some power changes may have been made during the calibration.
          * Update and commit the RXON