iwlwifi: remove some outdated iwl22000 configurations

A few configuration structures were either not referenced anymore or
assigned to devices IDs that were not in use anymore.  Remove them.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index bd687e745dc9cdee82fd6e301dc46ee36f98c3e2..1d3dc7cf4d63f920ea3641dee122c39cda165cef 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -247,28 +247,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
 #define IWL_NUM_RBDS_22000_HE          2048
 #define IWL_NUM_RBDS_AX210_HE          4096
 
-const struct iwl_cfg iwl22000_2ac_cfg_hr = {
-       .name = "Intel(R) Dual Band Wireless AC 22000",
-       .fw_name_pre = IWL_22000_HR_FW_PRE,
-       IWL_DEVICE_22500,
-       .num_rbds = IWL_NUM_RBDS_NON_HE,
-};
-
-const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb = {
-       .name = "Intel(R) Dual Band Wireless AC 22000",
-       .fw_name_pre = IWL_22000_HR_CDB_FW_PRE,
-       IWL_DEVICE_22500,
-       .cdb = true,
-       .num_rbds = IWL_NUM_RBDS_NON_HE,
-};
-
-const struct iwl_cfg iwl22000_2ac_cfg_jf = {
-       .name = "Intel(R) Dual Band Wireless AC 22000",
-       .fw_name_pre = IWL_22000_JF_FW_PRE,
-       IWL_DEVICE_22500,
-       .num_rbds = IWL_NUM_RBDS_NON_HE,
-};
-
 const struct iwl_cfg iwl_ax101_cfg_qu_hr = {
        .name = "Intel(R) Wi-Fi 6 AX101",
        .fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index f8a93324d7c0cfde185044f3aa3969e463c55ac1..31a6f286f7f7f787bb8ead87cefb43f0a7ddc990 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -598,9 +598,6 @@ extern const struct iwl_cfg iwl9560_2ac_cfg_shared_clk;
 extern const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk;
 extern const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk;
 extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk;
-extern const struct iwl_cfg iwl22000_2ac_cfg_hr;
-extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;
-extern const struct iwl_cfg iwl22000_2ac_cfg_jf;
 extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;
 extern const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0;
 extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index cdf112d6c0f981b57c23fc46ebdbde85adea8eba..bac3d3fa0dece9136603147d70b7adf4f23a4b4d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -910,7 +910,6 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
        {IWL_PCI_DEVICE(0x2720, 0x0074, iwl_ax201_cfg_qu_hr)},
        {IWL_PCI_DEVICE(0x2720, 0x0078, iwl_ax201_cfg_qu_hr)},
        {IWL_PCI_DEVICE(0x2720, 0x007C, iwl_ax201_cfg_qu_hr)},
-       {IWL_PCI_DEVICE(0x2720, 0x0090, iwl22000_2ac_cfg_hr_cdb)},
        {IWL_PCI_DEVICE(0x2720, 0x0244, iwl_ax101_cfg_qu_hr)},
        {IWL_PCI_DEVICE(0x2720, 0x0310, iwl_ax201_cfg_qu_hr)},
        {IWL_PCI_DEVICE(0x2720, 0x0A10, iwl_ax201_cfg_qu_hr)},
@@ -1083,11 +1082,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                else if ((hw_status & UMAG_GEN_HW_IS_FPGA) &&
                         CSR_HW_RF_STEP(iwl_trans->hw_rf_id) == SILICON_A_STEP) {
                        cfg = &iwl22000_2ax_cfg_qnj_hr_a0_f0;
-               } else {
-                       /*
-                        * a step no FPGA
-                        */
-                       cfg = &iwl22000_2ac_cfg_hr;
                }
        }