Commit 31aeae24 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: cfg: remove trailing dash from FW_PRE constants 



We have the trailing dash here, but that complicates all
the code. Simplify this by removing the dashes, adding
them to the *_MODULE_FIRMWARE macros, and adjusting the
code using this accordingly.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130443.72240ca13b83.I1f4ed547f0964719ed98a3ef928080462d594491@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ecf11f4e

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

+5 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020 Intel Corporation

 * Copyright(c) 2018 - 2020, 2023 Intel Corporation

 *****************************************************************************/



#include <linux/module.h>
@@ -22,11 +22,11 @@ 
#define EEPROM_1000_TX_POWER_VERSION	(4)

#define EEPROM_1000_EEPROM_VERSION	(0x15C)



#define IWL1000_FW_PRE "iwlwifi-1000-"

#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE __stringify(api) ".ucode"

#define IWL1000_FW_PRE "iwlwifi-1000"

#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE "-" __stringify(api) ".ucode"



#define IWL100_FW_PRE "iwlwifi-100-"

#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE __stringify(api) ".ucode"

#define IWL100_FW_PRE "iwlwifi-100"

#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE "-" __stringify(api) ".ucode"





static const struct iwl_base_params iwl1000_base_params = {

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

+9 −9
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020 Intel Corporation

 * Copyright(c) 2018 - 2020, 2023 Intel Corporation

 *****************************************************************************/



#include <linux/module.h>
@@ -28,17 +28,17 @@ 
#define EEPROM_2000_EEPROM_VERSION	(0x805)





#define IWL2030_FW_PRE "iwlwifi-2030-"

#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE __stringify(api) ".ucode"

#define IWL2030_FW_PRE "iwlwifi-2030"

#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE "-" __stringify(api) ".ucode"



#define IWL2000_FW_PRE "iwlwifi-2000-"

#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE __stringify(api) ".ucode"

#define IWL2000_FW_PRE "iwlwifi-2000"

#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE "-" __stringify(api) ".ucode"



#define IWL105_FW_PRE "iwlwifi-105-"

#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE __stringify(api) ".ucode"

#define IWL105_FW_PRE "iwlwifi-105"

#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE "-" __stringify(api) ".ucode"



#define IWL135_FW_PRE "iwlwifi-135-"

#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE __stringify(api) ".ucode"

#define IWL135_FW_PRE "iwlwifi-135"

#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE "-" __stringify(api) ".ucode"



static const struct iwl_base_params iwl2000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

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

+13 −13
Original line number Diff line number Diff line
@@ -26,26 +26,26 @@ 
#define IWL_22000_SMEM_OFFSET		0x400000

#define IWL_22000_SMEM_LEN		0xD0000



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

#define IWL_QU_C_HR_B_FW_PRE		"iwlwifi-Qu-c0-hr-b0-"

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

#define IWL_QU_C_JF_B_FW_PRE		"iwlwifi-Qu-c0-jf-b0-"

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

#define IWL_QUZ_A_JF_B_FW_PRE		"iwlwifi-QuZ-a0-jf-b0-"

#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0-"

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

#define IWL_QU_C_HR_B_FW_PRE		"iwlwifi-Qu-c0-hr-b0"

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

#define IWL_QU_C_JF_B_FW_PRE		"iwlwifi-Qu-c0-jf-b0"

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

#define IWL_QUZ_A_JF_B_FW_PRE		"iwlwifi-QuZ-a0-jf-b0"

#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0"



#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

	IWL_QU_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"

	IWL_QUZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_QUZ_A_JF_B_FW_PRE __stringify(api) ".ucode"

	IWL_QUZ_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QU_C_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_C_HR_B_FW_PRE __stringify(api) ".ucode"

	IWL_QU_C_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"

	IWL_QU_B_JF_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_CC_A_MODULE_FIRMWARE(api)			\

	IWL_CC_A_FW_PRE __stringify(api) ".ucode"

	IWL_CC_A_FW_PRE "-" __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

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

+5 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020 Intel Corporation

 * Copyright(c) 2018 - 2020, 2023 Intel Corporation

 *****************************************************************************/



#include <linux/module.h>
@@ -24,11 +24,11 @@ 
#define EEPROM_5050_TX_POWER_VERSION	(4)

#define EEPROM_5050_EEPROM_VERSION	(0x21E)



#define IWL5000_FW_PRE "iwlwifi-5000-"

#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode"

#define IWL5000_FW_PRE "iwlwifi-5000"

#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE "-" __stringify(api) ".ucode"



#define IWL5150_FW_PRE "iwlwifi-5150-"

#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE __stringify(api) ".ucode"

#define IWL5150_FW_PRE "iwlwifi-5150"

#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE "-" __stringify(api) ".ucode"



static const struct iwl_base_params iwl5000_base_params = {

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

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

+9 −9
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020 Intel Corporation

 * Copyright(c) 2018 - 2020, 2023 Intel Corporation

 *****************************************************************************/



#include <linux/module.h>
@@ -37,17 +37,17 @@ 
#define EEPROM_6035_TX_POWER_VERSION	(6)

#define EEPROM_6035_EEPROM_VERSION	(0x753)



#define IWL6000_FW_PRE "iwlwifi-6000-"

#define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE __stringify(api) ".ucode"

#define IWL6000_FW_PRE "iwlwifi-6000"

#define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE "-" __stringify(api) ".ucode"



#define IWL6050_FW_PRE "iwlwifi-6050-"

#define IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE __stringify(api) ".ucode"

#define IWL6050_FW_PRE "iwlwifi-6050"

#define IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE "-" __stringify(api) ".ucode"



#define IWL6005_FW_PRE "iwlwifi-6000g2a-"

#define IWL6005_MODULE_FIRMWARE(api) IWL6005_FW_PRE __stringify(api) ".ucode"

#define IWL6005_FW_PRE "iwlwifi-6000g2a"

#define IWL6005_MODULE_FIRMWARE(api) IWL6005_FW_PRE "-" __stringify(api) ".ucode"



#define IWL6030_FW_PRE "iwlwifi-6000g2b-"

#define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE __stringify(api) ".ucode"

#define IWL6030_FW_PRE "iwlwifi-6000g2b"

#define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE "-" __stringify(api) ".ucode"



static const struct iwl_base_params iwl6000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,