diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-05 15:51:20 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-07 13:19:52 -0500 |
commit | f93eaffcacb43b5764fb440ef50bf88dc7a2eb3e (patch) | |
tree | 0d392c0379d188ce8d319cb04229b63b66de610e /drivers/net/wireless/iwlegacy/common.c | |
parent | 94e1561344a7ef0e2aaed7c72050f8e4e82db1fe (diff) |
iwlegacy: Use standard #defines for PCIe Capability ASPM fields
Use the standard #defines rather than creating local definitions for
PCIe Capability ASPM fields.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 181150760461..7e16d10a7f14 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c | |||
@@ -1186,7 +1186,7 @@ il_power_initialize(struct il_priv *il) | |||
1186 | u16 lctl; | 1186 | u16 lctl; |
1187 | 1187 | ||
1188 | pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &lctl); | 1188 | pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &lctl); |
1189 | il->power_data.pci_pm = !(lctl & PCI_CFG_LINK_CTRL_VAL_L0S_EN); | 1189 | il->power_data.pci_pm = !(lctl & PCI_EXP_LNKCTL_ASPM_L0S); |
1190 | 1190 | ||
1191 | il->power_data.debug_sleep_level_override = -1; | 1191 | il->power_data.debug_sleep_level_override = -1; |
1192 | 1192 | ||
@@ -4235,8 +4235,7 @@ il_apm_init(struct il_priv *il) | |||
4235 | */ | 4235 | */ |
4236 | if (il->cfg->set_l0s) { | 4236 | if (il->cfg->set_l0s) { |
4237 | pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &lctl); | 4237 | pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &lctl); |
4238 | if ((lctl & PCI_CFG_LINK_CTRL_VAL_L1_EN) == | 4238 | if (lctl & PCI_EXP_LNKCTL_ASPM_L1) { |
4239 | PCI_CFG_LINK_CTRL_VAL_L1_EN) { | ||
4240 | /* L1-ASPM enabled; disable(!) L0S */ | 4239 | /* L1-ASPM enabled; disable(!) L0S */ |
4241 | il_set_bit(il, CSR_GIO_REG, | 4240 | il_set_bit(il, CSR_GIO_REG, |
4242 | CSR_GIO_REG_VAL_L0S_ENABLED); | 4241 | CSR_GIO_REG_VAL_L0S_ENABLED); |