wifi: iwlwifi: remove wrong CRF_IDs

Those CRF_IDs never existed and were a mistake. Those values are
CNVI_IDs.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240320232419.b7bea022622b.Ia6ffa981397dc11bd1acb7e190c275155857823d@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
index 8df6ec12b74e9395d934831395c7854e96e0e3df..05b4001c82249bd386460547d955c2a47ae6fe44 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
@@ -454,8 +454,6 @@ enum {
 #define REG_CRF_ID_TYPE_HR_NONE_CDB_CCP        0x532
 #define REG_CRF_ID_TYPE_GF                     0x410
 #define REG_CRF_ID_TYPE_FM                     0x910
-#define REG_CRF_ID_TYPE_FMI                    0x930
-#define REG_CRF_ID_TYPE_FMR                    0x900
 #define REG_CRF_ID_TYPE_WHP                    0xA10
 
 #define HPM_DEBUG                      0xA03440

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 75e5177cf140e2e75b9686f0bb78586a1016fbd2..7cba9f72dd11011d3848fdea499837421be317d8 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1202,8 +1202,6 @@ static int map_crf_id(struct iwl_trans *iwl_trans)
                iwl_trans->hw_rf_id = (IWL_CFG_RF_TYPE_GF << 12);
                break;
        case REG_CRF_ID_TYPE_FM:
-       case REG_CRF_ID_TYPE_FMI:
-       case REG_CRF_ID_TYPE_FMR:
                iwl_trans->hw_rf_id = (IWL_CFG_RF_TYPE_FM << 12);
                break;
        case REG_CRF_ID_TYPE_WHP: