summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-power.c
diff options
context:
space:
mode:
authorFry, Donald H2011-07-08 17:46:17 +0200
committerJohn W. Linville2011-07-11 21:02:04 +0200
commit6b6db91c8aa14fa9bd041321026d69b9f6ea42ff (patch)
treece6f18cdd3120b13041c8aad04f6dbe789c586a3 /drivers/net/wireless/iwlwifi/iwl-power.c
parentiwlagn: provide heplers to access the transport ops (diff)
downloadkernel-qcow2-linux-6b6db91c8aa14fa9bd041321026d69b9f6ea42ff.tar.gz
kernel-qcow2-linux-6b6db91c8aa14fa9bd041321026d69b9f6ea42ff.tar.xz
kernel-qcow2-linux-6b6db91c8aa14fa9bd041321026d69b9f6ea42ff.zip
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-power.c6
1 files changed, 3 insertions, 3 deletions
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,
if (!(cmd->flags & IWL_POWER_DRIVER_ALLOW_SLEEP_MSK))
clear_bit(STATUS_POWER_PMI, &priv->status);
- if (priv->cfg->ops->lib->update_chain_flags && update_chains)
- priv->cfg->ops->lib->update_chain_flags(priv);
- else if (priv->cfg->ops->lib->update_chain_flags)
+ if (update_chains)
+ iwl_update_chain_flags(priv);
+ else
IWL_DEBUG_POWER(priv,
"Cannot update the power, chain noise "
"calibration running: %d\n",