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

Commit 4a7bd3cf authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove duplicate FW string definitions 



The string we define as IWL_22000_HR_B_F0_FW_PRE is duplicate with
IWL_22000_QU_B_HR_B_FW_PRE.  Remove the former to avoid confusion.

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

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

+0 −4
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ 
#define IWL_22000_HR_FW_PRE		"iwlwifi-Qu-a0-hr-a0-"

#define IWL_22000_HR_CDB_FW_PRE		"iwlwifi-QuIcp-z0-hrcdb-a0-"

#define IWL_22000_HR_A_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"

#define IWL_22000_HR_B_F0_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"

#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-"
@@ -99,8 +98,6 @@ 
	IWL_22000_JF_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_A_F0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_B_F0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api)	\
@@ -663,7 +660,6 @@ const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = { 
MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));