Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / drivers / net / wireless / iwlwifi / iwl-7000.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 3fb327d5a911aeba53e4ac71ad6bb2ad419d06b0..1a73c7a1da77d0e0fe16fbdc6fb866d6c65226ee 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -72,12 +72,10 @@
 #define IWL7260_UCODE_API_MAX  17
 
 /* Oldest version we won't warn about */
-#define IWL7260_UCODE_API_OK   12
-#define IWL3165_UCODE_API_OK   13
+#define IWL7260_UCODE_API_OK   13
 
 /* Lowest firmware API version supported */
-#define IWL7260_UCODE_API_MIN  12
-#define IWL3165_UCODE_API_MIN  13
+#define IWL7260_UCODE_API_MIN  13
 
 /* NVM versions */
 #define IWL7260_NVM_VERSION            0x0a1d
@@ -113,7 +111,7 @@
 
 static const struct iwl_base_params iwl7000_base_params = {
        .eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,
-       .num_of_queues = IWLAGN_NUM_QUEUES,
+       .num_of_queues = 31,
        .pll_cfg_val = 0,
        .shadow_ram_support = true,
        .led_compensation = 57,
@@ -269,11 +267,6 @@ const struct iwl_cfg iwl3165_2ac_cfg = {
        .name = "Intel(R) Dual Band Wireless AC 3165",
        .fw_name_pre = IWL7265D_FW_PRE,
        IWL_DEVICE_7000,
-       /* sparse doens't like the re-assignment but it is safe */
-#ifndef __CHECKER__
-       .ucode_api_ok = IWL3165_UCODE_API_OK,
-       .ucode_api_min = IWL3165_UCODE_API_MIN,
-#endif
        .ht_params = &iwl7000_ht_params,
        .nvm_ver = IWL3165_NVM_VERSION,
        .nvm_calib_ver = IWL3165_TX_POWER_VERSION,