Commit cc2af963 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove all unnecessary occurrences of nvm_calib_ver 



Now that nvm_calib_ver is not checked in opmodes other than dvm, we
can remove it from all irrelevant configurations.

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

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

+0 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 


/* NVM versions */

#define IWL_22000_NVM_VERSION		0x0a1d

#define IWL_22000_TX_POWER_VERSION	0xffff /* meaningless */



/* Memory offsets and lengths */

#define IWL_22000_DCCM_OFFSET		0x800000 /* LMAC1 */
@@ -155,7 +154,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.mac_addr_from_csr = true,					\

	.ht_params = &iwl_22000_ht_params,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,			\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,		\

	.use_tfh = true,						\

	.rf_id = true,							\

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

+0 −21
Original line number Diff line number Diff line
@@ -80,17 +80,11 @@ 


/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d

#define IWL7260_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3160_NVM_VERSION		0x709

#define IWL3160_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3165_NVM_VERSION		0x709

#define IWL3165_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3168_NVM_VERSION		0xd01

#define IWL3168_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265_NVM_VERSION		0x0a1d

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265D_NVM_VERSION		0x0c11

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */



/* DCCM offsets and lengths */

#define IWL7000_DCCM_OFFSET		0x800000
@@ -189,7 +183,6 @@ const struct iwl_cfg iwl7260_2ac_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.lp_xtal_workaround = true,

	.dccm_len = IWL7260_DCCM_LEN,
@@ -201,7 +194,6 @@ const struct iwl_cfg iwl7260_2ac_cfg_high_temp = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.high_temp = true,

	.host_interrupt_operation_mode = true,

	.lp_xtal_workaround = true,
@@ -215,7 +207,6 @@ const struct iwl_cfg iwl7260_2n_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.lp_xtal_workaround = true,

	.dccm_len = IWL7260_DCCM_LEN,
@@ -227,7 +218,6 @@ const struct iwl_cfg iwl7260_n_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.lp_xtal_workaround = true,

	.dccm_len = IWL7260_DCCM_LEN,
@@ -239,7 +229,6 @@ const struct iwl_cfg iwl3160_2ac_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.dccm_len = IWL3160_DCCM_LEN,

};
@@ -250,7 +239,6 @@ const struct iwl_cfg iwl3160_2n_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.dccm_len = IWL3160_DCCM_LEN,

};
@@ -261,7 +249,6 @@ const struct iwl_cfg iwl3160_n_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.dccm_len = IWL3160_DCCM_LEN,

};
@@ -289,7 +276,6 @@ const struct iwl_cfg iwl3165_2ac_cfg = { 
	IWL_DEVICE_7005D,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3165_NVM_VERSION,

	.nvm_calib_ver = IWL3165_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -300,7 +286,6 @@ const struct iwl_cfg iwl3168_2ac_cfg = { 
	IWL_DEVICE_3008,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3168_NVM_VERSION,

	.nvm_calib_ver = IWL3168_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

	.nvm_type = IWL_NVM_SDP,
@@ -312,7 +297,6 @@ const struct iwl_cfg iwl7265_2ac_cfg = { 
	IWL_DEVICE_7005,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -323,7 +307,6 @@ const struct iwl_cfg iwl7265_2n_cfg = { 
	IWL_DEVICE_7005,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -334,7 +317,6 @@ const struct iwl_cfg iwl7265_n_cfg = { 
	IWL_DEVICE_7005,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -345,7 +327,6 @@ const struct iwl_cfg iwl7265d_2ac_cfg = { 
	IWL_DEVICE_7005D,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -356,7 +337,6 @@ const struct iwl_cfg iwl7265d_2n_cfg = { 
	IWL_DEVICE_7005D,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -367,7 +347,6 @@ const struct iwl_cfg iwl7265d_n_cfg = { 
	IWL_DEVICE_7005D,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};

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

+0 −6
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 


/* NVM versions */

#define IWL8000_NVM_VERSION		0x0a1d

#define IWL8000_TX_POWER_VERSION	0xffff /* meaningless */



/* Memory offsets and lengths */

#define IWL8260_DCCM_OFFSET		0x800000
@@ -176,7 +175,6 @@ const struct iwl_cfg iwl8260_2n_cfg = { 
	IWL_DEVICE_8260,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

};



const struct iwl_cfg iwl8260_2ac_cfg = {
@@ -185,7 +183,6 @@ const struct iwl_cfg iwl8260_2ac_cfg = { 
	IWL_DEVICE_8260,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};
@@ -195,7 +192,6 @@ const struct iwl_cfg iwl8265_2ac_cfg = { 
	IWL_DEVICE_8265,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.vht_mu_mimo_supported = true,

};
@@ -206,7 +202,6 @@ const struct iwl_cfg iwl8275_2ac_cfg = { 
	IWL_DEVICE_8265,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.vht_mu_mimo_supported = true,

};
@@ -217,7 +212,6 @@ const struct iwl_cfg iwl4165_2ac_cfg = { 
	IWL_DEVICE_8000,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};

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

+0 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 


/* NVM versions */

#define IWL9000_NVM_VERSION		0x0a1d

#define IWL9000_TX_POWER_VERSION	0xffff /* meaningless */



/* Memory offsets and lengths */

#define IWL9000_DCCM_OFFSET		0x800000
@@ -158,7 +157,6 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.d3_debug_data_length = 92 * 1024,				\

	.ht_params = &iwl9000_ht_params,				\

	.nvm_ver = IWL9000_NVM_VERSION,					\

	.nvm_calib_ver = IWL9000_TX_POWER_VERSION,			\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K

CRA Git | Maintained and supported by SUSTech CRA and CCSE