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

Commit 1d5cc555 authored by root's avatar root Committed by Wey-Yi Guy
Browse files

iwlwifi: remove extranious macro from firmware define 



define of firmware filenames use extra macro to build the files name.

Signed-off-by: default avatarJay Sternberg <jay.e.sternberg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent b37e3b6d

drivers/net/wireless/iwlwifi/iwl-1000.c

+2 −4
Original line number Diff line number Diff line
@@ -57,12 +57,10 @@ 
#define IWL100_UCODE_API_MIN 5



#define IWL1000_FW_PRE "iwlwifi-1000-"

#define _IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode"

#define IWL1000_MODULE_FIRMWARE(api) _IWL1000_MODULE_FIRMWARE(api)

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



#define IWL100_FW_PRE "iwlwifi-100-"

#define _IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE #api ".ucode"

#define IWL100_MODULE_FIRMWARE(api) _IWL100_MODULE_FIRMWARE(api)

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





/*

drivers/net/wireless/iwlwifi/iwl-2000.c

+3 −6
Original line number Diff line number Diff line
@@ -60,16 +60,13 @@ 
#define IWL200_UCODE_API_MIN 5



#define IWL2030_FW_PRE "iwlwifi-2030-"

#define _IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE #api ".ucode"

#define IWL2030_MODULE_FIRMWARE(api) _IWL2030_MODULE_FIRMWARE(api)

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



#define IWL2000_FW_PRE "iwlwifi-2000-"

#define _IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE #api ".ucode"

#define IWL2000_MODULE_FIRMWARE(api) _IWL2000_MODULE_FIRMWARE(api)

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



#define IWL200_FW_PRE "iwlwifi-200-"

#define _IWL200_MODULE_FIRMWARE(api) IWL200_FW_PRE #api ".ucode"

#define IWL200_MODULE_FIRMWARE(api) _IWL200_MODULE_FIRMWARE(api)

#define IWL200_MODULE_FIRMWARE(api) IWL200_FW_PRE #api ".ucode"



static void iwl2000_set_ct_threshold(struct iwl_priv *priv)

{

drivers/net/wireless/iwlwifi/iwl-5000.c

+2 −4
Original line number Diff line number Diff line
@@ -59,12 +59,10 @@ 
#define IWL5150_UCODE_API_MIN 1



#define IWL5000_FW_PRE "iwlwifi-5000-"

#define _IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE #api ".ucode"

#define IWL5000_MODULE_FIRMWARE(api) _IWL5000_MODULE_FIRMWARE(api)

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



#define IWL5150_FW_PRE "iwlwifi-5150-"

#define _IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE #api ".ucode"

#define IWL5150_MODULE_FIRMWARE(api) _IWL5150_MODULE_FIRMWARE(api)

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



/* NIC configuration for 5000 series */

static void iwl5000_nic_config(struct iwl_priv *priv)

drivers/net/wireless/iwlwifi/iwl-6000.c

+4 −8
Original line number Diff line number Diff line
@@ -60,20 +60,16 @@ 
#define IWL6000G2_UCODE_API_MIN 4



#define IWL6000_FW_PRE "iwlwifi-6000-"

#define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode"

#define IWL6000_MODULE_FIRMWARE(api) _IWL6000_MODULE_FIRMWARE(api)

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



#define IWL6050_FW_PRE "iwlwifi-6050-"

#define _IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE #api ".ucode"

#define IWL6050_MODULE_FIRMWARE(api) _IWL6050_MODULE_FIRMWARE(api)

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



#define IWL6005_FW_PRE "iwlwifi-6000g2a-"

#define _IWL6005_MODULE_FIRMWARE(api) IWL6005_FW_PRE #api ".ucode"

#define IWL6005_MODULE_FIRMWARE(api) _IWL6005_MODULE_FIRMWARE(api)

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



#define IWL6030_FW_PRE "iwlwifi-6000g2b-"

#define _IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE #api ".ucode"

#define IWL6030_MODULE_FIRMWARE(api) _IWL6030_MODULE_FIRMWARE(api)

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



static void iwl6000_set_ct_threshold(struct iwl_priv *priv)

{