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

iwlwifi: remove useless NVM_HW_SECTION_NUM_FAMILY_* macros 



These macros are useless because each one of them is used only once
and the element they are assigned to is already pretty clear about
what they mean, "nvm_hw_section_num".

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

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

+1 −3
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ 
#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_22000		10



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.num_of_queues = 512,
@@ -142,7 +140,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_22000,		\

	.nvm_hw_section_num = 10,					\

	.non_shared_ant = ANT_B,					\

	.dccm_offset = IWL_22000_DCCM_OFFSET,				\

	.dccm_len = IWL_22000_DCCM_LEN,					\

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

+1 −3
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ 
#define IWL7265D_FW_PRE "iwlwifi-7265D-"

#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_7000		0



static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_16K,

	.num_of_queues = 31,
@@ -159,7 +157,7 @@ static const struct iwl_ht_params iwl7000_ht_params = { 
	.device_family = IWL_DEVICE_FAMILY_7000,		\

	.base_params = &iwl7000_base_params,			\

	.led_mode = IWL_LED_RF_STATE,				\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_7000,	\

	.nvm_hw_section_num = 0,				\

	.non_shared_ant = ANT_A,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.dccm_offset = IWL7000_DCCM_OFFSET,			\

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

+1 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 
#define IWL8265_MODULE_FIRMWARE(api) \

	IWL8265_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_8000		10

#define DEFAULT_NVM_FILE_FAMILY_8000C		"nvmData-8000C"



static const struct iwl_base_params iwl8000_base_params = {
@@ -139,7 +138,7 @@ static const struct iwl_tt_params iwl8000_tt_params = { 
	.device_family = IWL_DEVICE_FAMILY_8000,			\

	.base_params = &iwl8000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000,		\

	.nvm_hw_section_num = 10,					\

	.features = NETIF_F_RXCSUM,					\

	.non_shared_ant = ANT_A,					\

	.dccm_offset = IWL8260_DCCM_OFFSET,				\

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

+1 −3
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ 
#define IWL9260B_MODULE_FIRMWARE(api) \

	IWL9260B_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_9000		10



static const struct iwl_base_params iwl9000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.num_of_queues = 31,
@@ -137,7 +135,7 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.device_family = IWL_DEVICE_FAMILY_9000,			\

	.base_params = &iwl9000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_9000,		\

	.nvm_hw_section_num = 10,					\

	.non_shared_ant = ANT_B,					\

	.dccm_offset = IWL9000_DCCM_OFFSET,				\

	.dccm_len = IWL9000_DCCM_LEN,					\

CRA Git | Maintained and supported by SUSTech CRA and CCSE