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

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

iwlwifi: cfg: remove unnecessary cfg data in non-dvm devices 



The max_data_size and max_inst_size values are only needed for DVM
devices.  Remove the assignment to those fields in 7000 and newer
families so we can also remove the otherwise unnecessary inclusion of
iwl-agn.h headers.

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

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

+0 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#include <linux/module.h>

#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	38
@@ -115,8 +114,6 @@ 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,			\

	.device_family = IWL_DEVICE_FAMILY_22000,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,				\

	.max_data_size = IWL60_RTC_DATA_SIZE,				\

	.base_params = &iwl_22000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_22000,		\

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

+4 −7
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 
#include <linux/module.h>

#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	17
@@ -162,8 +161,6 @@ static const struct iwl_ht_params iwl7000_ht_params = { 


#define IWL_DEVICE_7000_COMMON					\

	.device_family = IWL_DEVICE_FAMILY_7000,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.base_params = &iwl7000_base_params,			\

	.led_mode = IWL_LED_RF_STATE,				\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_7000,	\

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

+3 −6
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 
#include <linux/module.h>

#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	36
@@ -142,8 +141,6 @@ static const struct iwl_tt_params iwl8000_tt_params = { 


#define IWL_DEVICE_8000_COMMON						\

	.device_family = IWL_DEVICE_FAMILY_8000,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,				\

	.max_data_size = IWL60_RTC_DATA_SIZE,				\

	.base_params = &iwl8000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000,		\

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

+0 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#include <linux/module.h>

#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-agn-hw.h"

#include "fw/file.h"



/* Highest firmware API version supported */
@@ -135,8 +134,6 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.ucode_api_max = IWL9000_UCODE_API_MAX,				\

	.ucode_api_min = IWL9000_UCODE_API_MIN,				\

	.device_family = IWL_DEVICE_FAMILY_9000,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,				\

	.max_data_size = IWL60_RTC_DATA_SIZE,				\

	.base_params = &iwl9000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_9000,		\

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+2 −2
Original line number Diff line number Diff line
@@ -337,8 +337,8 @@ struct iwl_csr_params { 
 *	next step. Supported only in integrated solutions.

 * @ucode_api_max: Highest version of uCode API supported by driver.

 * @ucode_api_min: Lowest version of uCode API supported by driver.

 * @max_inst_size: The maximal length of the fw inst section

 * @max_data_size: The maximal length of the fw data section

 * @max_inst_size: The maximal length of the fw inst section (only DVM)

 * @max_data_size: The maximal length of the fw data section (only DVM)

 * @valid_tx_ant: valid transmit antenna

 * @valid_rx_ant: valid receive antenna

 * @non_shared_ant: the antenna that is for WiFi only