iwlegacy: merge il_base_params into il_cfg

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 17 insertions, 20 deletions

diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index 27feb533d025..cf1d0164a9a0 100644
--- a/drivers/net/wireless/iwlegacy/4965.c
+++ b/drivers/net/wireless/iwlegacy/4965.c
@@ -614,13 +614,13 @@ il4965_hw_set_hw_params(struct il_priv *il)
 {
         if (il->cfg->mod_params->num_of_queues >= IL_MIN_NUM_QUEUES &&
             il->cfg->mod_params->num_of_queues <= IL49_NUM_QUEUES)
-                il->cfg->base_params->num_of_queues =
+                il->cfg->num_of_queues =
                     il->cfg->mod_params->num_of_queues;
 
-        il->hw_params.max_txq_num = il->cfg->base_params->num_of_queues;
+        il->hw_params.max_txq_num = il->cfg->num_of_queues;
         il->hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM;
         il->hw_params.scd_bc_tbls_size =
-            il->cfg->base_params->num_of_queues *
+            il->cfg->num_of_queues *
             sizeof(struct il4965_scd_bc_tbl);
         il->hw_params.tfd_size = sizeof(struct il_tfd);
         il->hw_params.max_stations = IL4965_STATION_COUNT;
@@ -2331,22 +2331,6 @@ const struct il_ops il4965_ops = {
         .legacy = &il4965_legacy_ops,
 };
 
-static struct il_base_params il4965_base_params = {
-        .eeprom_size = IL4965_EEPROM_IMG_SIZE,
-        .num_of_queues = IL49_NUM_QUEUES,
-        .num_of_ampdu_queues = IL49_NUM_AMPDU_QUEUES,
-        .pll_cfg_val = 0,
-        .set_l0s = true,
-        .use_bsm = true,
-        .led_compensation = 61,
-        .chain_noise_num_beacons = IL4965_CAL_NUM_BEACONS,
-        .wd_timeout = IL_DEF_WD_TIMEOUT,
-        .temperature_kelvin = true,
-        .ucode_tracing = true,
-        .sensitivity_calib_by_driver = true,
-        .chain_noise_calib_by_driver = true,
-};
-
 struct il_cfg il4965_cfg = {
         .name = "Intel(R) Wireless WiFi Link 4965AGN",
         .fw_name_pre = IL4965_FW_PRE,
@@ -2358,13 +2342,26 @@ struct il_cfg il4965_cfg = {
         .eeprom_ver = EEPROM_4965_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION,
         .mod_params = &il4965_mod_params,
-        .base_params = &il4965_base_params,
         .led_mode = IL_LED_BLINK,
         /*
          * Force use of chains B and C for scan RX on 5 GHz band
          * because the device has off-channel reception on chain A.
          */
         .scan_rx_antennas[IEEE80211_BAND_5GHZ] = ANT_BC,
+
+        .eeprom_size = IL4965_EEPROM_IMG_SIZE,
+        .num_of_queues = IL49_NUM_QUEUES,
+        .num_of_ampdu_queues = IL49_NUM_AMPDU_QUEUES,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = true,
+        .led_compensation = 61,
+        .chain_noise_num_beacons = IL4965_CAL_NUM_BEACONS,
+        .wd_timeout = IL_DEF_WD_TIMEOUT,
+        .temperature_kelvin = true,
+        .ucode_tracing = true,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
 };
 
 /* Module firmware */