diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-14 18:23:39 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-18 11:23:56 -0400 |
commit | 86cb3b4e08a106594ee79c94dec9c7ca289cf999 (patch) | |
tree | 6c83c6367f30bbc65a9ee734cf553c69907d68d4 /drivers/net/wireless/iwlwifi/iwl-2000.c | |
parent | 916b337310969dd5eef35be0988a6bf768c138f9 (diff) |
iwlagn: merge duplicate code into single function
Same operation needed by multiple devices, move to single function.
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 | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c index 56a22de847d..1c1330035ca 100644 --- a/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/drivers/net/wireless/iwlwifi/iwl-2000.c | |||
@@ -74,21 +74,7 @@ static void iwl2000_set_ct_threshold(struct iwl_priv *priv) | |||
74 | /* NIC configuration for 2000 series */ | 74 | /* NIC configuration for 2000 series */ |
75 | static void iwl2000_nic_config(struct iwl_priv *priv) | 75 | static void iwl2000_nic_config(struct iwl_priv *priv) |
76 | { | 76 | { |
77 | u16 radio_cfg; | 77 | iwl_rf_config(priv); |
78 | |||
79 | radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG); | ||
80 | |||
81 | /* write radio config values to register */ | ||
82 | if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX) | ||
83 | iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG, | ||
84 | EEPROM_RF_CFG_TYPE_MSK(radio_cfg) | | ||
85 | EEPROM_RF_CFG_STEP_MSK(radio_cfg) | | ||
86 | EEPROM_RF_CFG_DASH_MSK(radio_cfg)); | ||
87 | |||
88 | /* set CSR_HW_CONFIG_REG for uCode use */ | ||
89 | iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG, | ||
90 | CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | | ||
91 | CSR_HW_IF_CONFIG_REG_BIT_MAC_SI); | ||
92 | 78 | ||
93 | if (priv->cfg->iq_invert) | 79 | if (priv->cfg->iq_invert) |
94 | iwl_set_bit(priv, CSR_GP_DRIVER_REG, | 80 | iwl_set_bit(priv, CSR_GP_DRIVER_REG, |