diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2025-05-05 21:56:46 +0300 |
|---|---|---|
| committer |   Miri Korenblit <miriam.rachel.korenblit@intel.com> | 2025-05-07 06:08:02 +0300 |
| commit | 3e84fe5fb5e89a6a2aa2ac0fbd2886a68803cdc2 (patch) | |
| tree | a9e4c89bdadba6cc61e07756bbc6938694642213 /drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | |
| parent | wifi: iwlwifi: dvm: init 'keep_alive_beacons' in power tables (diff) | |
| download | wireguard-linux-3e84fe5fb5e89a6a2aa2ac0fbd2886a68803cdc2.tar.xz wireguard-linux-3e84fe5fb5e89a6a2aa2ac0fbd2886a68803cdc2.zip | |
wifi: iwlwifi: remove NVM C step override
This was used for debug/bringup of 8000 devices, to be able to
unify between all 8000 devices with NVM override. However, this
is really no longer used, those are ancient devices by now, so
we can remove the logic.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20250505215513.6210ac6cda09.I83cc3e68f0ed99a922d435c203fef840a28eb0de@changeid
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c index db49f0caff12..734f9e814a54 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c @@ -308,7 +308,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm) int ret, section; u32 size_read = 0; u8 *nvm_buffer, *temp; - const char *nvm_file_C = mvm->cfg->default_nvm_file_C_step; if (WARN_ON_ONCE(mvm->cfg->nvm_hw_section_num >= NVM_MAX_NUM_SECTIONS)) return -EINVAL; @@ -384,21 +383,8 @@ int iwl_nvm_init(struct iwl_mvm *mvm) /* read External NVM file from the mod param */ ret = iwl_read_external_nvm(mvm->trans, mvm->nvm_file_name, mvm->nvm_sections); - if (ret) { - mvm->nvm_file_name = nvm_file_C; - - if ((ret == -EFAULT || ret == -ENOENT) && - mvm->nvm_file_name) { - /* in case nvm file was failed try again */ - ret = iwl_read_external_nvm(mvm->trans, - mvm->nvm_file_name, - mvm->nvm_sections); - if (ret) - return ret; - } else { - return ret; - } - } + if (ret) + return ret; } /* parse the relevant nvm sections */ |