Commit 94cc0b9e authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove unused iwlax210_2ax_cfg_so_hr_a0 structure 



We don't use this structure anymore, except for a check that will
never match, so we can remove this structure entirely.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211204083238.c41548abd174.I6bb4f6058fd85e1dd92cd056b6eaca1cb4aa74a3@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 26e9ccb3

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+0 −7
Original line number Diff line number Diff line
@@ -699,13 +699,6 @@ const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0 = { 
	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {

	.name = "Intel(R) Wi-Fi 6 AX210 160MHz",

	.fw_name_pre = IWL_SO_A_HR_B_FW_PRE,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = {

	.name = iwl_ax211_name,

	.fw_name_pre = IWL_SO_A_GF_A_FW_PRE,

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −1
Original line number Diff line number Diff line
@@ -610,7 +610,6 @@ extern const struct iwl_cfg killer1650x_2ax_cfg; 
extern const struct iwl_cfg killer1650w_2ax_cfg;

extern const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg;

extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0;

extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;

extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0;

extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long;

extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+0 −15
Original line number Diff line number Diff line
@@ -1498,21 +1498,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	    (iwl_trans->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_7265D)

		iwl_trans->cfg = cfg_7265d;



	if (cfg == &iwlax210_2ax_cfg_so_hr_a0) {

		if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_TY) {

			iwl_trans->cfg = &iwlax210_2ax_cfg_ty_gf_a0;

		} else if (CSR_HW_RFID_TYPE(iwl_trans->hw_rf_id) ==

			   CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_JF)) {

			iwl_trans->cfg = &iwlax210_2ax_cfg_so_jf_b0;

		} else if (CSR_HW_RFID_TYPE(iwl_trans->hw_rf_id) ==

			   CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_GF)) {

			iwl_trans->cfg = &iwlax211_2ax_cfg_so_gf_a0;

		} else if (CSR_HW_RFID_TYPE(iwl_trans->hw_rf_id) ==

			   CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_GF4)) {

			iwl_trans->cfg = &iwlax411_2ax_cfg_so_gf4_a0;

		}

	}



	/*

	 * This is a hack to switch from Qu B0 to Qu C0.  We need to

	 * do this for all cfgs that use Qu B0, except for those using