leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlagn: remove double level temperature indirect call

Browse Source 
No need to do double level indirect call after driver split
no functional changes

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Wey-Yi Guy 2011-07-08 08:46:20 -07:00 committed by John W. Linville
parent 70e3e8a6e8
commit 909fc3cba3
6 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-1000.c
View File

@ -183,9 +183,7 @@ static struct iwl_lib_ops iwl1000_lib = {
EEPROM_REGULATORY_BAND_NO_HT40,
},
},
.temp_ops = {
.temperature = iwlagn_temperature,
},
.temperature = iwlagn_temperature,
};
static const struct iwl_ops iwl1000_ops = {

4
drivers/net/wireless/iwlwifi/iwl-2000.c
View File

@ -184,9 +184,7 @@ static struct iwl_lib_ops iwl2000_lib = {
},
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
},
.temp_ops = {
.temperature = iwlagn_temperature,
},
.temperature = iwlagn_temperature,
};
static const struct iwl_ops iwl2000_ops = {

8
drivers/net/wireless/iwlwifi/iwl-5000.c
View File

@ -336,9 +336,7 @@ static struct iwl_lib_ops iwl5000_lib = {
EEPROM_REG_BAND_52_HT40_CHANNELS
},
},
.temp_ops = {
.temperature = iwlagn_temperature,
},
.temperature = iwlagn_temperature,
};
static struct iwl_lib_ops iwl5150_lib = {
@ -359,9 +357,7 @@ static struct iwl_lib_ops iwl5150_lib = {
EEPROM_REG_BAND_52_HT40_CHANNELS
},
},
.temp_ops = {
.temperature = iwl5150_temperature,
},
.temperature = iwl5150_temperature,
};
static const struct iwl_ops iwl5000_ops = {

8
drivers/net/wireless/iwlwifi/iwl-6000.c
View File

@ -277,9 +277,7 @@ static struct iwl_lib_ops iwl6000_lib = {
},
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
},
.temp_ops = {
.temperature = iwlagn_temperature,
},
.temperature = iwlagn_temperature,
};
static struct iwl_lib_ops iwl6030_lib = {
@ -302,9 +300,7 @@ static struct iwl_lib_ops iwl6030_lib = {
},
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
},
.temp_ops = {
.temperature = iwlagn_temperature,
},
.temperature = iwlagn_temperature,
};
static struct iwl_nic_ops iwl6050_nic_ops = {

6
drivers/net/wireless/iwlwifi/iwl-core.h
View File

@ -96,10 +96,6 @@ struct iwl_hcmd_utils_ops {
int (*request_scan)(struct iwl_priv *priv, struct ieee80211_vif *vif);
};
struct iwl_temp_ops {
void (*temperature)(struct iwl_priv *priv);
};
struct iwl_lib_ops {
/* set hw dependent parameters */
int (*set_hw_params)(struct iwl_priv *priv);
@ -120,7 +116,7 @@ struct iwl_lib_ops {
struct iwl_eeprom_ops eeprom_ops;
/* temperature */
struct iwl_temp_ops temp_ops;
void (*temperature)(struct iwl_priv *priv);
};
/* NIC specific ops */

4
drivers/net/wireless/iwlwifi/iwl-rx.c
View File

@ -624,8 +624,8 @@ static void iwl_rx_statistics(struct iwl_priv *priv,
iwl_rx_calc_noise(priv);
queue_work(priv->workqueue, &priv->run_time_calib_work);
}
if (priv->cfg->ops->lib->temp_ops.temperature && change)
priv->cfg->ops->lib->temp_ops.temperature(priv);
if (priv->cfg->ops->lib->temperature && change)
priv->cfg->ops->lib->temperature(priv);
}
static void iwl_rx_reply_statistics(struct iwl_priv *priv,