summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-10 10:32:51 +0000
committerBjorn Helgaas <bhelgaas@google.com>2013-04-15 14:15:44 -0600
commitffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59 (patch)
tree0ed3a91e7ffc698748a8326894ea250d027f8fff /drivers/pci
parent769ba7212f2059ca9fe0c73371e3d415c8c1c529 (diff)
downloadop-kernel-dev-ffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59.zip
op-kernel-dev-ffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59.tar.gz
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')
-rw-r--r--drivers/pci/pci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index fc9bd81..a5e0e5f 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)
{
u16 pmcsr;
- if (!dev->pm_cap)
+ if (!dev->pme_support)
return;
pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
@@ -1920,6 +1920,7 @@ void pci_pm_init(struct pci_dev *dev)
dev->wakeup_prepared = false;
dev->pm_cap = 0;
+ dev->pme_support = 0;
/* find PCI PM capability in list */
pm = pci_find_capability(dev, PCI_CAP_ID_PM);
@@ -1971,8 +1972,6 @@ void pci_pm_init(struct pci_dev *dev)
device_set_wakeup_capable(&dev->dev, true);
/* Disable the PME# generation functionality */
pci_pme_active(dev, false);
- } else {
- dev->pme_support = 0;
}
}
OpenPOWER on IntegriCloud