diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-10 06:32:51 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-15 16:15:44 -0400 |
commit | ffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59 (patch) | |
tree | 0ed3a91e7ffc698748a8326894ea250d027f8fff /drivers/pci/pci.c | |
parent | 769ba7212f2059ca9fe0c73371e3d415c8c1c529 (diff) |
PCI/PM: Make pci_pme_active() ignore devices without PME support
Make pci_pme_active() ignore devices without PME support, so that
it doesn't print the "PME enabled" or "PME disabled" debug messages
for devices that don't support PME.
So that pci_pme_active() doesn't have to check pm_cap in addition
to pme_support, make pci_pm_init() clear pme_support upfront to
make sure that it will be 0 for pm_cap equal to 0.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index fc9bd81e8e3b..a5e0e5f4953c 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1571,7 +1571,7 @@ void pci_pme_active(struct pci_dev *dev, bool enable) | |||
1571 | { | 1571 | { |
1572 | u16 pmcsr; | 1572 | u16 pmcsr; |
1573 | 1573 | ||
1574 | if (!dev->pm_cap) | 1574 | if (!dev->pme_support) |
1575 | return; | 1575 | return; |
1576 | 1576 | ||
1577 | pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); | 1577 | pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); |
@@ -1920,6 +1920,7 @@ void pci_pm_init(struct pci_dev *dev) | |||
1920 | dev->wakeup_prepared = false; | 1920 | dev->wakeup_prepared = false; |
1921 | 1921 | ||
1922 | dev->pm_cap = 0; | 1922 | dev->pm_cap = 0; |
1923 | dev->pme_support = 0; | ||
1923 | 1924 | ||
1924 | /* find PCI PM capability in list */ | 1925 | /* find PCI PM capability in list */ |
1925 | pm = pci_find_capability(dev, PCI_CAP_ID_PM); | 1926 | pm = pci_find_capability(dev, PCI_CAP_ID_PM); |
@@ -1971,8 +1972,6 @@ void pci_pm_init(struct pci_dev *dev) | |||
1971 | device_set_wakeup_capable(&dev->dev, true); | 1972 | device_set_wakeup_capable(&dev->dev, true); |
1972 | /* Disable the PME# generation functionality */ | 1973 | /* Disable the PME# generation functionality */ |
1973 | pci_pme_active(dev, false); | 1974 | pci_pme_active(dev, false); |
1974 | } else { | ||
1975 | dev->pme_support = 0; | ||
1976 | } | 1975 | } |
1977 | } | 1976 | } |
1978 | 1977 | ||