aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-eeprom.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-07-07 11:33:01 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-07-16 10:37:28 -0400
commit90c300cbd89e76789dbff101a1cb1ec226af277f (patch)
tree2b25a09768aab208765fc28795bdd7c1874a9199 /drivers/net/wireless/iwlwifi/iwl-eeprom.c
parente505c433d35900d98870a2e266759166a03030dc (diff)
iwlagn: remove dual-indirect call to simply the code
After driver split, no need to make the code so complex Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-eeprom.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index eee97bcf9802..19d31a5e32e5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -543,7 +543,7 @@ static void iwl_init_band_reference(const struct iwl_priv *priv,
543 const struct iwl_eeprom_channel **eeprom_ch_info, 543 const struct iwl_eeprom_channel **eeprom_ch_info,
544 const u8 **eeprom_ch_index) 544 const u8 **eeprom_ch_index)
545{ 545{
546 u32 offset = priv->cfg->ops->lib-> 546 u32 offset = priv->cfg->lib->
547 eeprom_ops.regulatory_bands[eep_band - 1]; 547 eeprom_ops.regulatory_bands[eep_band - 1];
548 switch (eep_band) { 548 switch (eep_band) {
549 case 1: /* 2.4GHz band */ 549 case 1: /* 2.4GHz band */
@@ -749,9 +749,9 @@ int iwl_init_channel_map(struct iwl_priv *priv)
749 } 749 }
750 750
751 /* Check if we do have HT40 channels */ 751 /* Check if we do have HT40 channels */
752 if (priv->cfg->ops->lib->eeprom_ops.regulatory_bands[5] == 752 if (priv->cfg->lib->eeprom_ops.regulatory_bands[5] ==
753 EEPROM_REGULATORY_BAND_NO_HT40 && 753 EEPROM_REGULATORY_BAND_NO_HT40 &&
754 priv->cfg->ops->lib->eeprom_ops.regulatory_bands[6] == 754 priv->cfg->lib->eeprom_ops.regulatory_bands[6] ==
755 EEPROM_REGULATORY_BAND_NO_HT40) 755 EEPROM_REGULATORY_BAND_NO_HT40)
756 return 0; 756 return 0;
757 757
@@ -787,8 +787,8 @@ int iwl_init_channel_map(struct iwl_priv *priv)
787 * driver need to process addition information 787 * driver need to process addition information
788 * to determine the max channel tx power limits 788 * to determine the max channel tx power limits
789 */ 789 */
790 if (priv->cfg->ops->lib->eeprom_ops.update_enhanced_txpower) 790 if (priv->cfg->lib->eeprom_ops.update_enhanced_txpower)
791 priv->cfg->ops->lib->eeprom_ops.update_enhanced_txpower(priv); 791 priv->cfg->lib->eeprom_ops.update_enhanced_txpower(priv);
792 792
793 return 0; 793 return 0;
794} 794}