wifi: iwlwifi: remove Mr/Ms radio

This radio never shipped, so we don't need to have it in the code.
Remove the configurations and a few lines of code for it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241231135726.9f984db3efa0.I5a39ec951430e765bdea49ff150dd41af5e911f3@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
index 4a76cffda4889c85922628df9e7a2e93ef8acddc..dcba1a5d793b729fcfb5c8006d2bf8d762774650 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
@@ -31,15 +31,12 @@
 #define IWL_SO_A_GF_A_FW_PRE           "iwlwifi-so-a0-gf-a0"
 #define IWL_TY_A_GF_A_FW_PRE           "iwlwifi-ty-a0-gf-a0"
 #define IWL_SO_A_GF4_A_FW_PRE          "iwlwifi-so-a0-gf4-a0"
-#define IWL_SO_A_MR_A_FW_PRE           "iwlwifi-so-a0-mr-a0"
 #define IWL_MA_A_HR_B_FW_PRE           "iwlwifi-ma-a0-hr-b0"
 #define IWL_MA_A_GF_A_FW_PRE           "iwlwifi-ma-a0-gf-a0"
 #define IWL_MA_A_GF4_A_FW_PRE          "iwlwifi-ma-a0-gf4-a0"
-#define IWL_MA_A_MR_A_FW_PRE           "iwlwifi-ma-a0-mr-a0"
 #define IWL_MA_B_HR_B_FW_PRE           "iwlwifi-ma-b0-hr-b0"
 #define IWL_MA_B_GF_A_FW_PRE           "iwlwifi-ma-b0-gf-a0"
 #define IWL_MA_B_GF4_A_FW_PRE          "iwlwifi-ma-b0-gf4-a0"
-#define IWL_MA_B_MR_A_FW_PRE           "iwlwifi-ma-b0-mr-a0"
 
 #define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \
        IWL_SO_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"
@@ -251,13 +248,6 @@ const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = {
        .trans.low_latency_xtal = true,
 };
 
-const struct iwl_cfg iwl_cfg_so_a0_ms_a0 = {
-       .fw_name_pre = IWL_SO_A_MR_A_FW_PRE,
-       .uhb_supported = false,
-       IWL_DEVICE_AX210,
-       .num_rbds = IWL_NUM_RBDS_AX210_HE,
-};
-
 const struct iwl_cfg iwl_cfg_ma = {
        .fw_name_mac = "ma",
        .uhb_supported = true,
@@ -278,8 +268,6 @@ IWL_FW_AND_PNVM(IWL_TY_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
 MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 IWL_FW_AND_PNVM(IWL_MA_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
 IWL_FW_AND_PNVM(IWL_MA_A_GF4_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
-IWL_FW_AND_PNVM(IWL_MA_A_MR_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
 MODULE_FIRMWARE(IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 IWL_FW_AND_PNVM(IWL_MA_B_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
 IWL_FW_AND_PNVM(IWL_MA_B_GF4_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
-IWL_FW_AND_PNVM(IWL_MA_B_MR_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index f5587f2fb109f71fa8e3bfd07b5d82ec74fe0828..2b6a80142aba98bdb8bc1b866bc11c6cbd48efc9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -661,7 +661,6 @@ extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long;
 extern const struct iwl_cfg iwl_cfg_ma;
 
 extern const struct iwl_cfg iwl_cfg_so_a0_hr_a0;
-extern const struct iwl_cfg iwl_cfg_so_a0_ms_a0;
 extern const struct iwl_cfg iwl_cfg_quz_a0_hr_b0;
 
 extern const struct iwl_cfg iwl_cfg_bz;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
index b4462bc1cf229d0b0840cd9a752655c567e08aeb..be9e464c9b7b0822390b0b23dbe91332431d5757 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -353,7 +353,6 @@ enum {
 #define CSR_HW_RF_ID_TYPE_HRCDB                (0x00109F00)
 #define CSR_HW_RF_ID_TYPE_GF           (0x0010D000)
 #define CSR_HW_RF_ID_TYPE_GF4          (0x0010E000)
-#define CSR_HW_RF_ID_TYPE_MS           (0x00111000)
 #define CSR_HW_RF_ID_TYPE_FM           (0x00112000)
 #define CSR_HW_RF_ID_TYPE_WP           (0x00113000)
 

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index 3677e015488888a341ade84470b101b6546ea2f5..9bcdca2b19eb973187d6868abfebc186adb76340 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -294,9 +294,6 @@ static void iwl_pcie_get_rf_name(struct iwl_trans *trans)
        case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_HRCDB):
                pos = scnprintf(buf, buflen, "HRCDB");
                break;
-       case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_MS):
-               pos = scnprintf(buf, buflen, "MS");
-               break;
        case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_FM):
                pos = scnprintf(buf, buflen, "FM");
                break;