1 files changed, 16 insertions, 17 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 3b6f48bfe0e3..d037f69afdc1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -60,8 +60,8 @@ static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,
 
         ht_info->ht_supported = true;
 
-        if (priv->cfg->ht_params &&
-            priv->cfg->ht_params->ht_greenfield_support)
+        if (cfg(priv)->ht_params &&
+            cfg(priv)->ht_params->ht_greenfield_support)
                 ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
         ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
         max_bit_rate = MAX_BIT_RATE_20_MHZ;
@@ -76,11 +76,11 @@ static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,
                 ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
 
         ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
-        if (priv->cfg->bt_params && priv->cfg->bt_params->ampdu_factor)
-                ht_info->ampdu_factor = priv->cfg->bt_params->ampdu_factor;
+        if (cfg(priv)->bt_params && cfg(priv)->bt_params->ampdu_factor)
+                ht_info->ampdu_factor = cfg(priv)->bt_params->ampdu_factor;
         ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;
-        if (priv->cfg->bt_params && priv->cfg->bt_params->ampdu_density)
-                ht_info->ampdu_density = priv->cfg->bt_params->ampdu_density;
+        if (cfg(priv)->bt_params && cfg(priv)->bt_params->ampdu_density)
+                ht_info->ampdu_density = cfg(priv)->bt_params->ampdu_density;
 
         ht_info->mcs.rx_mask[0] = 0xFF;
         if (rx_chains_num >= 2)
@@ -141,7 +141,7 @@ int iwl_init_geos(struct iwl_priv *priv)
         sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
         sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
 
-        if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE)
+        if (cfg(priv)->sku & EEPROM_SKU_CAP_11N_ENABLE)
                 iwl_init_ht_hw_capab(priv, &sband->ht_cap,
                                          IEEE80211_BAND_5GHZ);
 
@@ -151,7 +151,7 @@ int iwl_init_geos(struct iwl_priv *priv)
         sband->bitrates = rates;
         sband->n_bitrates = IWL_RATE_COUNT_LEGACY;
 
-        if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE)
+        if (cfg(priv)->sku & EEPROM_SKU_CAP_11N_ENABLE)
                 iwl_init_ht_hw_capab(priv, &sband->ht_cap,
                                          IEEE80211_BAND_2GHZ);
 
@@ -206,12 +206,12 @@ int iwl_init_geos(struct iwl_priv *priv)
         priv->tx_power_next = max_tx_power;
 
         if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
-             priv->cfg->sku & EEPROM_SKU_CAP_BAND_52GHZ) {
+             cfg(priv)->sku & EEPROM_SKU_CAP_BAND_52GHZ) {
                 char buf[32];
                 bus_get_hw_id(bus(priv), buf, sizeof(buf));
                 IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
                         "Please send your %s to maintainer.\n", buf);
-                priv->cfg->sku &= ~EEPROM_SKU_CAP_BAND_52GHZ;
+                cfg(priv)->sku &= ~EEPROM_SKU_CAP_BAND_52GHZ;
         }
 
         IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",
@@ -966,9 +966,9 @@ int iwl_apm_init(struct iwl_priv *priv)
         bus_apm_config(bus(priv));
 
         /* Configure analog phase-lock-loop before activating to D0A */
-        if (priv->cfg->base_params->pll_cfg_val)
+        if (cfg(priv)->base_params->pll_cfg_val)
                 iwl_set_bit(bus(priv), CSR_ANA_PLL_CFG,
-                            priv->cfg->base_params->pll_cfg_val);
+                            cfg(priv)->base_params->pll_cfg_val);
 
         /*
          * Set "initialization complete" bit to move adapter from
@@ -1465,7 +1465,7 @@ void iwl_bg_watchdog(unsigned long data)
         if (iwl_is_rfkill(priv->shrd))
                 return;
 
-        timeout = priv->cfg->base_params->wd_timeout;
+        timeout = cfg(priv)->base_params->wd_timeout;
         if (timeout == 0)
                 return;
 
@@ -1490,11 +1490,11 @@ void iwl_bg_watchdog(unsigned long data)
 
 void iwl_setup_watchdog(struct iwl_priv *priv)
 {
-        unsigned int timeout = priv->cfg->base_params->wd_timeout;
+        unsigned int timeout = cfg(priv)->base_params->wd_timeout;
 
         if (!iwlagn_mod_params.wd_disable) {
                 /* use system default */
-                if (timeout && !priv->cfg->base_params->wd_disable)
+                if (timeout && !cfg(priv)->base_params->wd_disable)
                         mod_timer(&priv->watchdog,
                                 jiffies +
                                 msecs_to_jiffies(IWL_WD_TICK(timeout)));
@@ -1619,8 +1619,7 @@ void iwl_set_hw_rfkill_state(struct iwl_priv *priv, bool state)
 
 void iwl_nic_config(struct iwl_priv *priv)
 {
-        priv->cfg->lib->nic_config(priv);
-
+        cfg(priv)->lib->nic_config(priv);
 }
 
 void iwl_free_skb(struct iwl_priv *priv, struct sk_buff *skb)