iwlagn: hw_params moves to iwl_shared

Since it is used by all the layers, it needs to move to iwl_shared.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 31 insertions, 31 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index c79f1f7830b0..e073422edab4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -140,13 +140,13 @@ static void iwl5150_set_ct_threshold(struct iwl_priv *priv)
         s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -
                         iwl_temp_calib_to_offset(priv);
 
-        priv->hw_params.ct_kill_threshold = threshold * volt2temp_coef;
+        hw_params(priv).ct_kill_threshold = threshold * volt2temp_coef;
 }
 
 static void iwl5000_set_ct_threshold(struct iwl_priv *priv)
 {
         /* want Celsius */
-        priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;
+        hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;
 }
 
 static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
@@ -156,38 +156,38 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
                 priv->cfg->base_params->num_of_queues =
                         iwlagn_mod_params.num_of_queues;
 
-        priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;
-        priv->hw_params.scd_bc_tbls_size =
+        hw_params(priv).max_txq_num = priv->cfg->base_params->num_of_queues;
+        hw_params(priv).scd_bc_tbls_size =
                         priv->cfg->base_params->num_of_queues *
                         sizeof(struct iwlagn_scd_bc_tbl);
-        priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-        priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
+        hw_params(priv).tfd_size = sizeof(struct iwl_tfd);
+        hw_params(priv).max_stations = IWLAGN_STATION_COUNT;
         priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;
 
-        priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;
-        priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
+        hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;
+        hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;
 
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
+        hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
                                         BIT(IEEE80211_BAND_5GHZ);
 
-        priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
-        priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);
-        priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
-        priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
+        hw_params(priv).tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
+        hw_params(priv).rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);
+        hw_params(priv).valid_tx_ant = priv->cfg->valid_tx_ant;
+        hw_params(priv).valid_rx_ant = priv->cfg->valid_rx_ant;
 
         iwl5000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
         /* Set initial calibration set */
-        priv->hw_params.sens = &iwl5000_sensitivity;
-        priv->hw_params.calib_init_cfg =
+        hw_params(priv).sens = &iwl5000_sensitivity;
+        hw_params(priv).calib_init_cfg =
                 BIT(IWL_CALIB_XTAL)             |
                 BIT(IWL_CALIB_LO)               |
                 BIT(IWL_CALIB_TX_IQ)            |
                 BIT(IWL_CALIB_TX_IQ_PERD)       |
                 BIT(IWL_CALIB_BASE_BAND);
 
-        priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
+        hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
 
         return 0;
 }
@@ -199,38 +199,38 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)
                 priv->cfg->base_params->num_of_queues =
                         iwlagn_mod_params.num_of_queues;
 
-        priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;
-        priv->hw_params.scd_bc_tbls_size =
+        hw_params(priv).max_txq_num = priv->cfg->base_params->num_of_queues;
+        hw_params(priv).scd_bc_tbls_size =
                         priv->cfg->base_params->num_of_queues *
                         sizeof(struct iwlagn_scd_bc_tbl);
-        priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-        priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
+        hw_params(priv).tfd_size = sizeof(struct iwl_tfd);
+        hw_params(priv).max_stations = IWLAGN_STATION_COUNT;
         priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;
 
-        priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;
-        priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
+        hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;
+        hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;
 
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
+        hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
                                         BIT(IEEE80211_BAND_5GHZ);
 
-        priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
-        priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);
-        priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
-        priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
+        hw_params(priv).tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
+        hw_params(priv).rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);
+        hw_params(priv).valid_tx_ant = priv->cfg->valid_tx_ant;
+        hw_params(priv).valid_rx_ant = priv->cfg->valid_rx_ant;
 
         iwl5150_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
         /* Set initial calibration set */
-        priv->hw_params.sens = &iwl5150_sensitivity;
-        priv->hw_params.calib_init_cfg =
+        hw_params(priv).sens = &iwl5150_sensitivity;
+        hw_params(priv).calib_init_cfg =
                 BIT(IWL_CALIB_LO)               |
                 BIT(IWL_CALIB_TX_IQ)            |
                 BIT(IWL_CALIB_BASE_BAND);
         if (priv->cfg->need_dc_calib)
-                priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC);
+                hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);
 
-        priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
+        hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
 
         return 0;
 }