diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-09-22 04:51:17 -0400 |
---|---|---|
committer | Luca Coelho <luciano.coelho@intel.com> | 2015-10-05 07:33:30 -0400 |
commit | 5736b7eba362ee304335808325ad60e2249ac670 (patch) | |
tree | ec988d24e71879ca89b0e9093feff094c0280f46 | |
parent | ed21a384bbd2b011289dd1b5cab7eebc7ebeda11 (diff) |
iwlwifi: remove IWL3165_UCODE_API_OK and _MIN
As the 3165 device uses the same firmware as 7265-D and currently
all 7000 series (including 3160/3165) use the same API versions
remove IWL3165_UCODE_API_OK and _MIN. We might have to put them
back if firmware support ever splits, but in that case might also
have to add a different MODULE_FIRMWARE statement.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-7000.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c index 5b25f367ef48..d561181f2cff 100644 --- a/drivers/net/wireless/iwlwifi/iwl-7000.c +++ b/drivers/net/wireless/iwlwifi/iwl-7000.c | |||
@@ -73,11 +73,9 @@ | |||
73 | 73 | ||
74 | /* Oldest version we won't warn about */ | 74 | /* Oldest version we won't warn about */ |
75 | #define IWL7260_UCODE_API_OK 13 | 75 | #define IWL7260_UCODE_API_OK 13 |
76 | #define IWL3165_UCODE_API_OK 13 | ||
77 | 76 | ||
78 | /* Lowest firmware API version supported */ | 77 | /* Lowest firmware API version supported */ |
79 | #define IWL7260_UCODE_API_MIN 13 | 78 | #define IWL7260_UCODE_API_MIN 13 |
80 | #define IWL3165_UCODE_API_MIN 13 | ||
81 | 79 | ||
82 | /* NVM versions */ | 80 | /* NVM versions */ |
83 | #define IWL7260_NVM_VERSION 0x0a1d | 81 | #define IWL7260_NVM_VERSION 0x0a1d |
@@ -269,11 +267,6 @@ const struct iwl_cfg iwl3165_2ac_cfg = { | |||
269 | .name = "Intel(R) Dual Band Wireless AC 3165", | 267 | .name = "Intel(R) Dual Band Wireless AC 3165", |
270 | .fw_name_pre = IWL7265D_FW_PRE, | 268 | .fw_name_pre = IWL7265D_FW_PRE, |
271 | IWL_DEVICE_7000, | 269 | IWL_DEVICE_7000, |
272 | /* sparse doens't like the re-assignment but it is safe */ | ||
273 | #ifndef __CHECKER__ | ||
274 | .ucode_api_ok = IWL3165_UCODE_API_OK, | ||
275 | .ucode_api_min = IWL3165_UCODE_API_MIN, | ||
276 | #endif | ||
277 | .ht_params = &iwl7000_ht_params, | 270 | .ht_params = &iwl7000_ht_params, |
278 | .nvm_ver = IWL3165_NVM_VERSION, | 271 | .nvm_ver = IWL3165_NVM_VERSION, |
279 | .nvm_calib_ver = IWL3165_TX_POWER_VERSION, | 272 | .nvm_calib_ver = IWL3165_TX_POWER_VERSION, |