aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2009-02-10 18:19:02 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-02-13 13:46:04 -0500
commit3fdb68de22c9881691c485b05ed3204bdc431a18 (patch)
tree6a898270c086aa90c7f9716504a73376c811c63b /drivers/net/wireless/iwlwifi/iwl-agn.c
parentfe3d2c3fe32dd4d0a421ba39caba1cf87402314e (diff)
iwlwifi: use pci registers defined in pci_regs.h
This patch replaces where possible usage of pci register defined in the driver by ones defined in pci_regs.h Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 539960da7e13..397577c06c92 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -940,11 +940,7 @@ int iwl_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src)
940 goto err; 940 goto err;
941 941
942 if (src == IWL_PWR_SRC_VAUX) { 942 if (src == IWL_PWR_SRC_VAUX) {
943 u32 val; 943 if (pci_pme_capable(priv->pci_dev, PCI_D3cold))
944 ret = pci_read_config_dword(priv->pci_dev, PCI_CFG_POWER_SOURCE,
945 &val);
946
947 if (val & PCI_CFG_PMC_PME_FROM_D3COLD_SUPPORT)
948 iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG, 944 iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
949 APMG_PS_CTRL_VAL_PWR_SRC_VAUX, 945 APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
950 ~APMG_PS_CTRL_MSK_PWR_SRC); 946 ~APMG_PS_CTRL_MSK_PWR_SRC);