Commit 1454edca authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove redundant iwl9560_2ac_cfg struct 



The iwl9560_2ac_cfg struct is used for PNJ devices and the
configuration is the same as iwl9260_2ac_cfg, so we can remove the
former to avoid redundancy.

Change-Id: I17ac1802f00bd80006930b922a9fc21df60e3c16
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9124061a

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

+0 −5
Original line number Diff line number Diff line
@@ -200,11 +200,6 @@ const char iwl9560_killer_1550i_name[] = 
const char iwl9560_killer_1550s_name[] =

	"Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)";



const struct iwl_cfg iwl9560_2ac_cfg = {

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9560_2ac_cfg_soc = {

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

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

+6 −6
Original line number Diff line number Diff line
@@ -885,28 +885,28 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg, iwl9461_160_name),

		      iwl9260_2ac_cfg, iwl9461_160_name),

	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg, iwl9461_name),

		      iwl9260_2ac_cfg, iwl9461_name),

	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,

		      IWL_CFG_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg, iwl9462_160_name),

		      iwl9260_2ac_cfg, iwl9462_160_name),

	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg, iwl9462_name),

		      iwl9260_2ac_cfg, iwl9462_name),



	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,

		      IWL_CFG_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg, iwl9560_160_name),

		      iwl9260_2ac_cfg, iwl9560_160_name),

	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg, iwl9560_name),

		      iwl9260_2ac_cfg, iwl9560_name),



	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_TH, IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,