aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-power.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-10 14:23:36 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-18 11:17:29 -0400
commitd57fa99d91bd6e8ca8217c115824b2732f4d3639 (patch)
treeef68724476bd1b325927fae76b4b4fe15f9ab933 /drivers/net/wireless/iwlwifi/iwl-power.c
parent795414db8607a195541fe1a8f072021011b73386 (diff)
iwlagn: move PCI power related functions to the PCI layer
Continue to popule the PCI layer and the iwl_bus_ops with the power related stuff. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-power.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index a69b55124176..970c514623b9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -245,7 +245,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,
245 } 245 }
246 } 246 }
247 247
248 if (priv->power_data.pci_pm) 248 if (priv->power_data.bus_pm)
249 cmd->flags |= IWL_POWER_PCI_PM_MSK; 249 cmd->flags |= IWL_POWER_PCI_PM_MSK;
250 else 250 else
251 cmd->flags &= ~IWL_POWER_PCI_PM_MSK; 251 cmd->flags &= ~IWL_POWER_PCI_PM_MSK;
@@ -260,7 +260,7 @@ static void iwl_power_sleep_cam_cmd(struct iwl_priv *priv,
260{ 260{
261 memset(cmd, 0, sizeof(*cmd)); 261 memset(cmd, 0, sizeof(*cmd));
262 262
263 if (priv->power_data.pci_pm) 263 if (priv->power_data.bus_pm)
264 cmd->flags |= IWL_POWER_PCI_PM_MSK; 264 cmd->flags |= IWL_POWER_PCI_PM_MSK;
265 265
266 IWL_DEBUG_POWER(priv, "Sleep command for CAM\n"); 266 IWL_DEBUG_POWER(priv, "Sleep command for CAM\n");
@@ -296,7 +296,7 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv,
296 cmd->flags = IWL_POWER_DRIVER_ALLOW_SLEEP_MSK | 296 cmd->flags = IWL_POWER_DRIVER_ALLOW_SLEEP_MSK |
297 IWL_POWER_FAST_PD; /* no use seeing frames for others */ 297 IWL_POWER_FAST_PD; /* no use seeing frames for others */
298 298
299 if (priv->power_data.pci_pm) 299 if (priv->power_data.bus_pm)
300 cmd->flags |= IWL_POWER_PCI_PM_MSK; 300 cmd->flags |= IWL_POWER_PCI_PM_MSK;
301 301
302 if (priv->cfg->base_params->shadow_reg_enable) 302 if (priv->cfg->base_params->shadow_reg_enable)
@@ -425,9 +425,7 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force)
425/* initialize to default */ 425/* initialize to default */
426void iwl_power_initialize(struct iwl_priv *priv) 426void iwl_power_initialize(struct iwl_priv *priv)
427{ 427{
428 u16 lctl = iwl_pcie_link_ctl(priv); 428 priv->power_data.bus_pm = priv->bus.ops->get_pm_support(&priv->bus);
429
430 priv->power_data.pci_pm = !(lctl & PCI_CFG_LINK_CTRL_VAL_L0S_EN);
431 429
432 priv->power_data.debug_sleep_level_override = -1; 430 priv->power_data.debug_sleep_level_override = -1;
433 431