Commit 6dece0e9 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove CSR registers abstraction 



We needed this abstraction for some CSR registers for
IWL_DEVICE_22560, but that has been removed, so we don't need the
abstraction anymore.  Remove it.

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

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

+2 −4
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
@@ -104,8 +103,7 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

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

+4 −8
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl2000_2bgn_cfg = {
@@ -131,8 +130,7 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -153,8 +151,7 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -181,8 +178,7 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl135_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

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

+0 −2
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	IWL_DEVICE_22000_COMMON,					\

	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\

	.trans.base_params = &iwl_22000_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.gp2_reg_addr = 0xa02c68,					\

	.mon_dram_regs = {						\

		.write_ptr = {						\
@@ -217,7 +216,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.trans.umac_prph_offset = 0x300000,				\

	.trans.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.trans.base_params = &iwl_ax210_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.min_256_ba_txq_size = 512,					\

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

+2 −5
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
@@ -125,7 +124,6 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

	.trans.csr = &iwl_csr_v1,

};



#define IWL_DEVICE_5150						\
@@ -141,8 +139,7 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl5150_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",

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

+6 −13
Original line number Diff line number Diff line
@@ -124,8 +124,7 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = { 
	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6005_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",
@@ -179,8 +178,7 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = { 
	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6030_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
@@ -216,8 +214,7 @@ const struct iwl_cfg iwl6030_2bg_cfg = { 
	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6035_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",
@@ -272,8 +269,7 @@ const struct iwl_cfg iwl130_bg_cfg = { 
	.trans.base_params = &iwl6000_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6000i_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",
@@ -306,8 +302,7 @@ const struct iwl_cfg iwl6000i_2bg_cfg = { 
	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6050_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",
@@ -333,8 +328,7 @@ const struct iwl_cfg iwl6050_2abg_cfg = { 
	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6150_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",
@@ -361,7 +355,6 @@ const struct iwl_cfg iwl6000_3agn_cfg = { 
	.eeprom_params = &iwl6000_eeprom_params,

	.ht_params = &iwl6000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.trans.csr = &iwl_csr_v1,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

CRA Git | Maintained and supported by SUSTech CRA and CCSE