diff options
author | Don Fry <donald.h.fry@intel.com> | 2011-04-20 18:23:57 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-30 11:56:45 -0400 |
commit | 9d143e9a0d68025efe902d86eb6207cbec36dcdb (patch) | |
tree | 7aced3651272a266c3572d2a1c057499404347e2 /drivers/net/wireless/iwlwifi/iwl-2000.c | |
parent | b4ed221daba1b129c3efff8a7352d9791d034330 (diff) |
iwlagn: mod param cleanup
All agn devices use the same module parameter structure. Delete the
indirection and access the structure diretly.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-2000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-2000.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c index f90d6afc58c..476150f67d2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/drivers/net/wireless/iwlwifi/iwl-2000.c | |||
@@ -128,10 +128,10 @@ static struct iwl_sensitivity_ranges iwl2000_sensitivity = { | |||
128 | 128 | ||
129 | static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) | 129 | static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) |
130 | { | 130 | { |
131 | if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES && | 131 | if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES && |
132 | priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES) | 132 | iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES) |
133 | priv->cfg->base_params->num_of_queues = | 133 | priv->cfg->base_params->num_of_queues = |
134 | priv->cfg->mod_params->num_of_queues; | 134 | iwlagn_mod_params.num_of_queues; |
135 | 135 | ||
136 | priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues; | 136 | priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues; |
137 | priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM; | 137 | priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM; |
@@ -383,7 +383,6 @@ static struct iwl_bt_params iwl2030_bt_params = { | |||
383 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ | 383 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ |
384 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ | 384 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ |
385 | .ops = &iwl2000_ops, \ | 385 | .ops = &iwl2000_ops, \ |
386 | .mod_params = &iwlagn_mod_params, \ | ||
387 | .base_params = &iwl2000_base_params, \ | 386 | .base_params = &iwl2000_base_params, \ |
388 | .need_dc_calib = true, \ | 387 | .need_dc_calib = true, \ |
389 | .need_temp_offset_calib = true, \ | 388 | .need_temp_offset_calib = true, \ |
@@ -409,7 +408,6 @@ struct iwl_cfg iwl2000_2bg_cfg = { | |||
409 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ | 408 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ |
410 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ | 409 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ |
411 | .ops = &iwl2030_ops, \ | 410 | .ops = &iwl2030_ops, \ |
412 | .mod_params = &iwlagn_mod_params, \ | ||
413 | .base_params = &iwl2030_base_params, \ | 411 | .base_params = &iwl2030_base_params, \ |
414 | .bt_params = &iwl2030_bt_params, \ | 412 | .bt_params = &iwl2030_bt_params, \ |
415 | .need_dc_calib = true, \ | 413 | .need_dc_calib = true, \ |
@@ -436,7 +434,6 @@ struct iwl_cfg iwl2030_2bg_cfg = { | |||
436 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ | 434 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ |
437 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ | 435 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ |
438 | .ops = &iwl105_ops, \ | 436 | .ops = &iwl105_ops, \ |
439 | .mod_params = &iwlagn_mod_params, \ | ||
440 | .base_params = &iwl2000_base_params, \ | 437 | .base_params = &iwl2000_base_params, \ |
441 | .need_dc_calib = true, \ | 438 | .need_dc_calib = true, \ |
442 | .need_temp_offset_calib = true, \ | 439 | .need_temp_offset_calib = true, \ |
@@ -462,7 +459,6 @@ struct iwl_cfg iwl105_bgn_cfg = { | |||
462 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ | 459 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ |
463 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ | 460 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ |
464 | .ops = &iwl135_ops, \ | 461 | .ops = &iwl135_ops, \ |
465 | .mod_params = &iwlagn_mod_params, \ | ||
466 | .base_params = &iwl2030_base_params, \ | 462 | .base_params = &iwl2030_base_params, \ |
467 | .bt_params = &iwl2030_bt_params, \ | 463 | .bt_params = &iwl2030_bt_params, \ |
468 | .need_dc_calib = true, \ | 464 | .need_dc_calib = true, \ |