wifi: iwlwifi: mvm: remove IWL_MVM_PARSE_NVM

This debug is not in use anymore. Remove it.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20240618194245.bded22049fae.I980c4a941d769f93cf74bfc90a7d7d9fb384dea1@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/constants.h b/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
index 1abe9e9fd46b7ae9681fb314e52cd449f6aac6bb..c4c1e67b9ac76efe8dbf22889cbf60fc71218123 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
@@ -56,7 +56,6 @@
 #define IWL_MVM_RS_80_20_FAR_RANGE_TWEAK       1
 #define IWL_MVM_TOF_IS_RESPONDER               0
 #define IWL_MVM_HW_CSUM_DISABLE                        0
-#define IWL_MVM_PARSE_NVM                      0
 #define IWL_MVM_ADWELL_ENABLE                  1
 #define IWL_MVM_ADWELL_MAX_BUDGET              0
 #define IWL_MVM_TCM_LOAD_MEDIUM_THRESH         10 /* percentage */

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index b8a7850325134d3aabd5c3697aa61377ee2bf1c4..36ed08f20f80c6256dc582f77ded691761fb82b8 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -686,14 +686,6 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
                        goto error;
        }
 
-       if (IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
-               ret = iwl_nvm_init(mvm);
-               if (ret) {
-                       IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
-                       goto error;
-               }
-       }
-
        ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(REGULATORY_AND_NVM_GROUP,
                                                NVM_ACCESS_COMPLETE),
                                   CMD_SEND_IN_RFKILL,
@@ -718,7 +710,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
                return ret;
 
        /* Read the NVM only at driver load time, no need to do this twice */
-       if (!IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
+       if (!mvm->nvm_data) {
                mvm->nvm_data = iwl_get_nvm(mvm->trans, mvm->fw,
                                            mvm->set_tx_ant, mvm->set_rx_ant);
                if (IS_ERR(mvm->nvm_data)) {