linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 07/14] iwlwifi: remove redundant iwl9560_2ac_cfg struct
Date: Mon, 23 Mar 2020 15:19:18 +0200	[thread overview]
Message-ID: <iwlwifi.20200323151304.2ea1544bbf7c.I17ac1802f00bd80006930b922a9fc21df60e3c16@changeid> (raw)
In-Reply-To: <20200323131925.208376-1-luca@coelho.fi>

From: Luca Coelho <luciano.coelho@intel.com>

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.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/cfg/9000.c |  5 -----
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index d02936a8e11d..cb2604b01a99 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -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,
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 5413e80f86bb..5f10dba12c8c 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -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,
-- 
2.25.1


  parent reply	other threads:[~2020-03-23 13:19 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23 13:19 [PATCH 00/14] iwlwifi: updates intended for v5.7 2020-03-23 Luca Coelho
2020-03-23 13:19 ` [PATCH 01/14] iwlwifi: mvm: add soc latency support Luca Coelho
2020-03-24 15:07   ` Kalle Valo
2020-03-26  6:49     ` Luca Coelho
2020-03-26  7:32       ` Kalle Valo
2020-03-23 13:19 ` [PATCH 02/14] iwlwifi: yoyo: add PCI config space region type Luca Coelho
2020-03-23 13:19 ` [PATCH 03/14] iwlwifi: pcie: implement read_config32 Luca Coelho
2020-03-23 13:19 ` [PATCH 04/14] iwlwifi: pass trans and NVM data to HE capability parsing Luca Coelho
2020-03-23 13:19 ` [PATCH 05/14] iwlwifi: scan: support scan req cmd ver 14 Luca Coelho
2020-03-23 13:19 ` [PATCH 06/14] iwlwifi: mvm: rs-fw: fix some indentation Luca Coelho
2020-03-23 13:19 ` Luca Coelho [this message]
2020-03-23 13:19 ` [PATCH 08/14] iwlwifi: mvm: enable SF also when we have HE Luca Coelho
2020-03-23 13:19 ` [PATCH 09/14] iwlwifi: move integrated, extra_phy and soc_latency to trans_cfg Luca Coelho
2020-03-23 13:19 ` [PATCH 10/14] iwlwifi: remove some unused extern declarations from iwl-config.h Luca Coelho
2020-03-23 13:19 ` [PATCH 11/14] iwlwifi: add HW step to new cfg device table Luca Coelho
2020-03-23 13:19 ` [PATCH 12/14] iwlwifi: convert all Qu with Jf devices to the new config table Luca Coelho
2020-03-23 13:19 ` [PATCH 13/14] iwlwifi: convert QnJ with Jf devices to " Luca Coelho
2020-03-23 13:19 ` [PATCH 14/14] iwlwifi: remove unnecessary cfg mangling for Qu C and QuZ with Jf Luca Coelho

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=iwlwifi.20200323151304.2ea1544bbf7c.I17ac1802f00bd80006930b922a9fc21df60e3c16@changeid \
    --to=luca@coelho.fi \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).