diff options
author | Fry, Donald H <donald.h.fry@intel.com> | 2011-07-08 11:46:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-11 15:02:04 -0400 |
commit | 6b6db91c8aa14fa9bd041321026d69b9f6ea42ff (patch) | |
tree | ce6f18cdd3120b13041c8aad04f6dbe789c586a3 | |
parent | bdfbf0924ab05e02d28e50bd2d5024097642a78d (diff) |
iwlagn: remove the indirection for update_chain_flags
Not needed since the driver split.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-2000.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 6 |
8 files changed, 5 insertions, 16 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 9cc161df3f05..11f10c13af57 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c | |||
@@ -171,7 +171,6 @@ static struct iwl_lib_ops iwl1000_lib = { | |||
171 | .rx_handler_setup = iwlagn_rx_handler_setup, | 171 | .rx_handler_setup = iwlagn_rx_handler_setup, |
172 | .setup_deferred_work = iwlagn_setup_deferred_work, | 172 | .setup_deferred_work = iwlagn_setup_deferred_work, |
173 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 173 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
174 | .update_chain_flags = iwl_update_chain_flags, | ||
175 | .apm_ops = { | 174 | .apm_ops = { |
176 | .init = iwl_apm_init, | 175 | .init = iwl_apm_init, |
177 | .config = iwl1000_nic_config, | 176 | .config = iwl1000_nic_config, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c index 0c3245061f97..953e9672a6a7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/drivers/net/wireless/iwlwifi/iwl-2000.c | |||
@@ -171,7 +171,6 @@ static struct iwl_lib_ops iwl2000_lib = { | |||
171 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, | 171 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, |
172 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, | 172 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, |
173 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 173 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
174 | .update_chain_flags = iwl_update_chain_flags, | ||
175 | .apm_ops = { | 174 | .apm_ops = { |
176 | .init = iwl_apm_init, | 175 | .init = iwl_apm_init, |
177 | .config = iwl2000_nic_config, | 176 | .config = iwl2000_nic_config, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 835ed7a295e2..f6bc02f68f45 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -323,7 +323,6 @@ static struct iwl_lib_ops iwl5000_lib = { | |||
323 | .rx_handler_setup = iwlagn_rx_handler_setup, | 323 | .rx_handler_setup = iwlagn_rx_handler_setup, |
324 | .setup_deferred_work = iwlagn_setup_deferred_work, | 324 | .setup_deferred_work = iwlagn_setup_deferred_work, |
325 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 325 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
326 | .update_chain_flags = iwl_update_chain_flags, | ||
327 | .set_channel_switch = iwl5000_hw_channel_switch, | 326 | .set_channel_switch = iwl5000_hw_channel_switch, |
328 | .apm_ops = { | 327 | .apm_ops = { |
329 | .init = iwl_apm_init, | 328 | .init = iwl_apm_init, |
@@ -351,7 +350,6 @@ static struct iwl_lib_ops iwl5150_lib = { | |||
351 | .rx_handler_setup = iwlagn_rx_handler_setup, | 350 | .rx_handler_setup = iwlagn_rx_handler_setup, |
352 | .setup_deferred_work = iwlagn_setup_deferred_work, | 351 | .setup_deferred_work = iwlagn_setup_deferred_work, |
353 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 352 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
354 | .update_chain_flags = iwl_update_chain_flags, | ||
355 | .set_channel_switch = iwl5000_hw_channel_switch, | 353 | .set_channel_switch = iwl5000_hw_channel_switch, |
356 | .apm_ops = { | 354 | .apm_ops = { |
357 | .init = iwl_apm_init, | 355 | .init = iwl_apm_init, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index f03448f40f87..91418fa38fcc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -263,7 +263,6 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
263 | .rx_handler_setup = iwlagn_rx_handler_setup, | 263 | .rx_handler_setup = iwlagn_rx_handler_setup, |
264 | .setup_deferred_work = iwlagn_setup_deferred_work, | 264 | .setup_deferred_work = iwlagn_setup_deferred_work, |
265 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 265 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
266 | .update_chain_flags = iwl_update_chain_flags, | ||
267 | .set_channel_switch = iwl6000_hw_channel_switch, | 266 | .set_channel_switch = iwl6000_hw_channel_switch, |
268 | .apm_ops = { | 267 | .apm_ops = { |
269 | .init = iwl_apm_init, | 268 | .init = iwl_apm_init, |
@@ -293,7 +292,6 @@ static struct iwl_lib_ops iwl6030_lib = { | |||
293 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, | 292 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, |
294 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, | 293 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, |
295 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 294 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
296 | .update_chain_flags = iwl_update_chain_flags, | ||
297 | .set_channel_switch = iwl6000_hw_channel_switch, | 295 | .set_channel_switch = iwl6000_hw_channel_switch, |
298 | .apm_ops = { | 296 | .apm_ops = { |
299 | .init = iwl_apm_init, | 297 | .init = iwl_apm_init, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c index 2ec3863306b1..710ada9c4132 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c | |||
@@ -1001,8 +1001,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv) | |||
1001 | /* Some power changes may have been made during the calibration. | 1001 | /* Some power changes may have been made during the calibration. |
1002 | * Update and commit the RXON | 1002 | * Update and commit the RXON |
1003 | */ | 1003 | */ |
1004 | if (priv->cfg->ops->lib->update_chain_flags) | 1004 | iwl_update_chain_flags(priv); |
1005 | priv->cfg->ops->lib->update_chain_flags(priv); | ||
1006 | 1005 | ||
1007 | data->state = IWL_CHAIN_NOISE_DONE; | 1006 | data->state = IWL_CHAIN_NOISE_DONE; |
1008 | iwl_power_update_mode(priv, false); | 1007 | iwl_power_update_mode(priv, false); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index cfe945c58fd1..c7102bbba0f2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -1724,8 +1724,7 @@ static void iwlagn_bt_traffic_change_work(struct work_struct *work) | |||
1724 | if (test_bit(STATUS_SCAN_HW, &priv->status)) | 1724 | if (test_bit(STATUS_SCAN_HW, &priv->status)) |
1725 | goto out; | 1725 | goto out; |
1726 | 1726 | ||
1727 | if (priv->cfg->ops->lib->update_chain_flags) | 1727 | iwl_update_chain_flags(priv); |
1728 | priv->cfg->ops->lib->update_chain_flags(priv); | ||
1729 | 1728 | ||
1730 | if (smps_request != -1) { | 1729 | if (smps_request != -1) { |
1731 | priv->current_ht_config.smps = smps_request; | 1730 | priv->current_ht_config.smps = smps_request; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 3f7b921922ad..e1ab1a17e7f5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -121,9 +121,6 @@ struct iwl_lib_ops { | |||
121 | /* power management */ | 121 | /* power management */ |
122 | struct iwl_apm_ops apm_ops; | 122 | struct iwl_apm_ops apm_ops; |
123 | 123 | ||
124 | /* power */ | ||
125 | void (*update_chain_flags)(struct iwl_priv *priv); | ||
126 | |||
127 | /* eeprom operations (as defined in iwl-eeprom.h) */ | 124 | /* eeprom operations (as defined in iwl-eeprom.h) */ |
128 | struct iwl_eeprom_ops eeprom_ops; | 125 | struct iwl_eeprom_ops eeprom_ops; |
129 | 126 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 9c10462c20f0..64ff40ae1026 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
@@ -406,9 +406,9 @@ int iwl_power_set_mode(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd, | |||
406 | if (!(cmd->flags & IWL_POWER_DRIVER_ALLOW_SLEEP_MSK)) | 406 | if (!(cmd->flags & IWL_POWER_DRIVER_ALLOW_SLEEP_MSK)) |
407 | clear_bit(STATUS_POWER_PMI, &priv->status); | 407 | clear_bit(STATUS_POWER_PMI, &priv->status); |
408 | 408 | ||
409 | if (priv->cfg->ops->lib->update_chain_flags && update_chains) | 409 | if (update_chains) |
410 | priv->cfg->ops->lib->update_chain_flags(priv); | 410 | iwl_update_chain_flags(priv); |
411 | else if (priv->cfg->ops->lib->update_chain_flags) | 411 | else |
412 | IWL_DEBUG_POWER(priv, | 412 | IWL_DEBUG_POWER(priv, |
413 | "Cannot update the power, chain noise " | 413 | "Cannot update the power, chain noise " |
414 | "calibration running: %d\n", | 414 | "calibration running: %d\n", |