Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2644f9d0 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove unused 0x40C0 PCI device IDs 



This device ID and device type was never released, so we can remove it
from the PCI IDs list.

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

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

+0 −17
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ 
#define IWL_22000_QU_B_HR_B_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"

#define IWL_22000_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"

#define IWL_22000_HR_A0_FW_PRE		"iwlwifi-QuQnj-a0-hr-a0-"

#define IWL_22000_SU_Z0_FW_PRE		"iwlwifi-su-z0-"

#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"

#define IWL_QUZ_A_HR_B_FW_PRE		"iwlwifi-QuZ-a0-hr-b0-"

#define IWL_QNJ_B_JF_B_FW_PRE		"iwlwifi-QuQnj-b0-jf-b0-"
@@ -105,8 +104,6 @@ 
	IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SU_Z0_MODULE_FIRMWARE(api) \

	IWL_22000_SU_Z0_FW_PRE __stringify(api) ".ucode"

#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \
@@ -420,19 +417,6 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwl22560_2ax_cfg_su_cdb = {

	.name = "Intel(R) Dual Band Wireless AX 22560",

	.fw_name_pre = IWL_22000_SU_Z0_FW_PRE,

	IWL_DEVICE_22560,

	.cdb = true,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,
@@ -471,7 +455,6 @@ MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SU_Z0_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+0 −1
Original line number Diff line number Diff line
@@ -578,7 +578,6 @@ extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0; 
extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0;

extern const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0;

extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;

extern const struct iwl_cfg iwl22560_2ax_cfg_su_cdb;

extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;

extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;

extern const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0;

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

+0 −5
Original line number Diff line number Diff line
@@ -928,11 +928,6 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x34F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x4070, iwl_ax101_cfg_qu_hr)},

	{IWL_PCI_DEVICE(0x40C0, 0x0000, iwl22560_2ax_cfg_su_cdb)},

	{IWL_PCI_DEVICE(0x40C0, 0x0010, iwl22560_2ax_cfg_su_cdb)},

	{IWL_PCI_DEVICE(0x40c0, 0x0090, iwl22560_2ax_cfg_su_cdb)},

	{IWL_PCI_DEVICE(0x40C0, 0x0310, iwl22560_2ax_cfg_su_cdb)},

	{IWL_PCI_DEVICE(0x40C0, 0x0A10, iwl22560_2ax_cfg_su_cdb)},

	{IWL_PCI_DEVICE(0x43F0, 0x0040, iwl_ax101_cfg_qu_hr)},

	{IWL_PCI_DEVICE(0x43F0, 0x0070, iwl_ax101_cfg_qu_hr)},

	{IWL_PCI_DEVICE(0x43F0, 0x0074, iwl_ax101_cfg_qu_hr)},