[iwlwifi-next,01/15] wifi: iwlwifi: cfg: remove iwl_cfg_br

Message ID	20250502155404.83b86e8a182b.Iec7f3027e7058005a98ff6d05cc224ab61b7c44a@changeid
State	New
Headers	show Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DD2E24677A for <linux-wireless@vger.kernel.org>; Fri, 2 May 2025 12:56:47 +0000 (UTC) From: Miri Korenblit <miriam.rachel.korenblit@intel.com> To: miriam.rachel.korenblit@intel.com Cc: linux-wireless@vger.kernel.org, Johannes Berg <johannes.berg@intel.com> Subject: [PATCH iwlwifi-next 01/15] wifi: iwlwifi: cfg: remove iwl_cfg_br Date: Fri, 2 May 2025 15:56:17 +0300 Message-Id: <20250502155404.83b86e8a182b.Iec7f3027e7058005a98ff6d05cc224ab61b7c44a@changeid> In-Reply-To: <20250502125631.3184319-1-miriam.rachel.korenblit@intel.com> References: <20250502125631.3184319-1-miriam.rachel.korenblit@intel.com> Precedence: bulk MIME-Version: 1.0 Organization: Intel Israel (74) Limited Content-Transfer-Encoding: 8bit
Series	wifi: iwlwifi: updates - 2025-05-02 \| expand [iwlwifi-next,00/15] wifi: iwlwifi: updates - 2025-05-02 [iwlwifi-next,01/15] wifi: iwlwifi: cfg: remove iwl_cfg_br [iwlwifi-next,02/15] wifi: iwlwifi: tests: check configs are not duplicated [iwlwifi-next,03/15] wifi: iwlwifi: tests: check transport configs are not duplicated [iwlwifi-next,04/15] wifi: iwlwifi: cfg: clean up BW limit and subdev matching [iwlwifi-next,05/15] wifi: iwlwifi: cfg: rename BW_NO_LIMIT to BW_NOT_LIMITED [iwlwifi-next,06/15] wifi: iwlwifi: pcie: remove 'ent' argument from alloc [iwlwifi-next,07/15] wifi: iwlwifi: cfg: minor fixes for Sc [iwlwifi-next,08/15] wifi: iwlwifi: cfg: finish config split [iwlwifi-next,09/15] wifi: iwlwifi: cfg: move all names out of configs [iwlwifi-next,10/15] wifi: iwlwifi: tests: check for duplicate name strings [iwlwifi-next,11/15] wifi: iwlwifi: cfg: reduce mac_type to u8 [iwlwifi-next,12/15] wifi: iwlwifi: cfg: remove unnecessary configs [iwlwifi-next,13/15] wifi: iwlwifi: pcie: don't call itself indirectly [iwlwifi-next,14/15] wifi: iwlwifi: mvm: add command order checks to kunit [iwlwifi-next,15/15] wifi: iwlwifi: remove iwl_cmd_groups_verify_sorted()

Message ID

20250502155404.83b86e8a182b.Iec7f3027e7058005a98ff6d05cc224ab61b7c44a@changeid

State

New

Headers

From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: miriam.rachel.korenblit@intel.com
Cc: linux-wireless@vger.kernel.org,
	Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH iwlwifi-next 01/15] wifi: iwlwifi: cfg: remove iwl_cfg_br
Date: Fri,  2 May 2025 15:56:17 +0300
Message-Id: 
 <20250502155404.83b86e8a182b.Iec7f3027e7058005a98ff6d05cc224ab61b7c44a@changeid>
In-Reply-To: <20250502125631.3184319-1-miriam.rachel.korenblit@intel.com>
References: <20250502125631.3184319-1-miriam.rachel.korenblit@intel.com>
Precedence: bulk
MIME-Version: 1.0
Organization: Intel Israel (74) Limited
Content-Transfer-Encoding: 8bit

Series

wifi: iwlwifi: updates - 2025-05-02 | expand

Commit Message

Miri Korenblit May 2, 2025, 12:56 p.m. UTC

From: Johannes Berg <johannes.berg@intel.com>

This is the same as iwl_cfg_dr, just different by the MAC,
so no need to keep a separate config; remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/cfg/dr.c     | 4 ----
 drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 -
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c   | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
index 4bca1b13858f..8bbeb2a1f691 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
@@ -154,10 +154,6 @@  const struct iwl_cfg_trans_params iwl_br_trans_cfg = {
 
 const char iwl_br_name[] = "Intel(R) TBD Br device";
 
-const struct iwl_cfg iwl_cfg_br = {
-	IWL_DEVICE_DR,
-};
-
 MODULE_FIRMWARE(IWL_DR_A_PE_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_BR_A_PET_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_BR_A_PE_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 8862148a49bb..1ecd873911bc 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -642,7 +642,6 @@  extern const struct iwl_cfg iwl_cfg_bz;
 
 extern const struct iwl_cfg iwl_cfg_sc;
 extern const struct iwl_cfg iwl_cfg_dr;
-extern const struct iwl_cfg iwl_cfg_br;
 #endif /* CONFIG_IWLMLD */
 
 #endif /* __IWL_CONFIG_H__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 6c4854f44b26..b96b85e7d5d8 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1152,7 +1152,7 @@  VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
 	IWL_DEV_INFO(iwl_cfg_dr, iwl_dr_name, MAC_TYPE(DR)),
 
 /* Br */
-	IWL_DEV_INFO(iwl_cfg_br, iwl_br_name, MAC_TYPE(BR)),
+	IWL_DEV_INFO(iwl_cfg_dr, iwl_br_name, MAC_TYPE(BR)),
 #endif /* CONFIG_IWLMLD */
 };
 EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_dev_info_table);

[iwlwifi-next,01/15] wifi: iwlwifi: cfg: remove iwl_cfg_br

Commit Message

Patch