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

Commit 9d143e9a authored by Don Fry's avatar Don Fry Committed by Wey-Yi Guy
Browse files

iwlagn: mod param cleanup 



All agn devices use the same module parameter structure.  Delete the
indirection and access the structure diretly.

Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent b4ed221d

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

+3 −5
Original line number Diff line number Diff line
@@ -121,10 +121,10 @@ static struct iwl_sensitivity_ranges iwl1000_sensitivity = { 


static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;

			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
@@ -249,7 +249,6 @@ static struct iwl_ht_params iwl1000_ht_params = { 
	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.ops = &iwl1000_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl1000_base_params,			\

	.led_mode = IWL_LED_BLINK
@@ -271,7 +270,6 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.ops = &iwl1000_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl1000_base_params,			\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true

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

+3 −7
Original line number Diff line number Diff line
@@ -128,10 +128,10 @@ static struct iwl_sensitivity_ranges iwl2000_sensitivity = { 


static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;

			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
@@ -383,7 +383,6 @@ static struct iwl_bt_params iwl2030_bt_params = { 
	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.ops = &iwl2000_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl2000_base_params,			\

	.need_dc_calib = true,					\

	.need_temp_offset_calib = true,				\
@@ -409,7 +408,6 @@ struct iwl_cfg iwl2000_2bg_cfg = { 
	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.ops = &iwl2030_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl2030_base_params,			\

	.bt_params = &iwl2030_bt_params,			\

	.need_dc_calib = true,					\
@@ -436,7 +434,6 @@ struct iwl_cfg iwl2030_2bg_cfg = { 
	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.ops = &iwl105_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl2000_base_params,			\

	.need_dc_calib = true,					\

	.need_temp_offset_calib = true,				\
@@ -462,7 +459,6 @@ struct iwl_cfg iwl105_bgn_cfg = { 
	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.ops = &iwl135_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl2030_base_params,			\

	.bt_params = &iwl2030_bt_params,			\

	.need_dc_calib = true,					\

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

+6 −9
Original line number Diff line number Diff line
@@ -165,10 +165,10 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv) 


static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;

			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
@@ -210,10 +210,10 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 


static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;

			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
@@ -468,7 +468,6 @@ static struct iwl_ht_params iwl5000_ht_params = { 
	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.ops = &iwl5000_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl5000_base_params,			\

	.led_mode = IWL_LED_BLINK
@@ -512,7 +511,6 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.ops = &iwl5000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,
@@ -526,7 +524,6 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\

	.ops = &iwl5150_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl5000_base_params,			\

	.need_dc_calib = true,					\

	.led_mode = IWL_LED_BLINK,				\

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

+3 −9
Original line number Diff line number Diff line
@@ -154,10 +154,10 @@ static struct iwl_sensitivity_ranges iwl6000_sensitivity = { 


static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;

			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
@@ -482,7 +482,6 @@ static struct iwl_bt_params iwl6000_bt_params = { 
	.eeprom_ver = EEPROM_6005_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\

	.ops = &iwl6000_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl6000_g2_base_params,			\

	.need_dc_calib = true,					\

	.need_temp_offset_calib = true,				\
@@ -511,7 +510,6 @@ struct iwl_cfg iwl6005_2bg_cfg = { 
	.eeprom_ver = EEPROM_6030_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.ops = &iwl6030_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl6000_g2_base_params,			\

	.bt_params = &iwl6000_bt_params,			\

	.need_dc_calib = true,					\
@@ -593,7 +591,6 @@ struct iwl_cfg iwl130_bg_cfg = { 
	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,	\

	.ops = &iwl6000_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl6000_base_params,			\

	.pa_type = IWL_PA_INTERNAL,				\

	.led_mode = IWL_LED_BLINK
@@ -623,7 +620,6 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.ops = &iwl6050_ops,					\

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,	\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl6050_base_params,			\

	.need_dc_calib = true,					\

	.led_mode = IWL_LED_BLINK,				\
@@ -648,7 +644,6 @@ struct iwl_cfg iwl6150_bgn_cfg = { 
	.eeprom_ver = EEPROM_6150_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,

	.ops = &iwl6150_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6050_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,
@@ -664,7 +659,6 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,

	.ops = &iwl6000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ int iwlagn_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq) 


	rb_timeout = RX_RB_TIMEOUT;



	if (priv->cfg->mod_params->amsdu_size_8K)

	if (iwlagn_mod_params.amsdu_size_8K)

		rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K;

	else

		rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;