From: Johannes Berg <johannes.berg@xxxxxxxxx>
There are the same values as JF2/JF1 respectively, and
that really matches the code names. Remove TH/TH1.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@xxxxxxxxx>
---
drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 --
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 12 ++++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index b9bd89bfdd74..f9fdb7c97636 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -432,8 +432,6 @@ struct iwl_cfg {
#define IWL_CFG_MAC_TYPE_BR 0x4C
#define IWL_CFG_MAC_TYPE_DR 0x4D
-#define IWL_CFG_RF_TYPE_TH 0x105
-#define IWL_CFG_RF_TYPE_TH1 0x108
#define IWL_CFG_RF_TYPE_JF2 0x105
#define IWL_CFG_RF_TYPE_JF1 0x108
#define IWL_CFG_RF_TYPE_HR2 0x10A
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 0330e55e8480..7b09edc2430c 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -903,24 +903,24 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
BW_LIMIT(80), CORES(BT), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9270_160_name, DEVICE(0x2526),
- MAC_TYPE(TH), RF_TYPE(TH),
+ MAC_TYPE(TH), RF_TYPE(JF2),
BW_NO_LIMIT, CORES(BT_GNSS), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9270_name, DEVICE(0x2526),
- MAC_TYPE(TH), RF_TYPE(TH),
+ MAC_TYPE(TH), RF_TYPE(JF2),
BW_LIMIT(80), CORES(BT_GNSS), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9162_160_name, DEVICE(0x271B),
- MAC_TYPE(TH), RF_TYPE(TH1),
+ MAC_TYPE(TH), RF_TYPE(JF1),
BW_NO_LIMIT, CORES(BT), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9162_name, DEVICE(0x271B),
- MAC_TYPE(TH), RF_TYPE(TH1),
+ MAC_TYPE(TH), RF_TYPE(JF1),
BW_LIMIT(80), CORES(BT), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9260_160_name, DEVICE(0x2526),
- MAC_TYPE(TH), RF_TYPE(TH),
+ MAC_TYPE(TH), RF_TYPE(JF2),
BW_NO_LIMIT, CORES(BT), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9260_name, DEVICE(0x2526),
- MAC_TYPE(TH), RF_TYPE(TH),
+ MAC_TYPE(TH), RF_TYPE(JF2),
BW_LIMIT(80), CORES(BT), NO_CDB),
/* Qu with Jf */
--
2.34.1
