Skip to content

Commit ebe7b06

Browse files
committed
iwlwifi: pcie: remove mangling for iwl_ax101_cfg_qu_hr
All devices that use iwl_ax101_cfg_qu_hr are recognized via the device info table, so the cfg will never be iwl_ax101_cfg_qu_hr. Remove the code that converts this into QuZ and Qu-C, since it's not needed anymore. Signed-off-by: Luca Coelho <[email protected]> Link: https://lore.kernel.org/r/iwlwifi.20200424194456.30b6b4aae1c1.If5e583835c9f7f2771a50ba1b2f33bb85f25b383@changeid
1 parent 53abad4 commit ebe7b06

File tree

1 file changed

+0
-23
lines changed
  • drivers/net/wireless/intel/iwlwifi/pcie

1 file changed

+0
-23
lines changed

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,29 +1062,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
10621062
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_GF4)) {
10631063
iwl_trans->cfg = &iwlax411_2ax_cfg_so_gf4_a0;
10641064
}
1065-
} else if (cfg == &iwl_ax101_cfg_qu_hr) {
1066-
if ((CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) ==
1067-
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
1068-
iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) ||
1069-
(CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) ==
1070-
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR1))) {
1071-
iwl_trans->cfg = &iwl22000_2ax_cfg_qnj_hr_b0;
1072-
} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) ==
1073-
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
1074-
iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
1075-
iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;
1076-
} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) ==
1077-
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {
1078-
iwl_trans->cfg = &iwl_ax101_cfg_qu_hr;
1079-
} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) ==
1080-
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HRCDB)) {
1081-
IWL_ERR(iwl_trans, "RF ID HRCDB is not supported\n");
1082-
return -EINVAL;
1083-
} else {
1084-
IWL_ERR(iwl_trans, "Unrecognized RF ID 0x%08x\n",
1085-
CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id));
1086-
return -EINVAL;
1087-
}
10881065
}
10891066

10901067
/*

0 commit comments

Comments
 (0)