lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: tidy PME support messages

Browse Source 
This patch changes these two messages:

    pci 0000:00:03.0: supports D1
    pci 0000:00:03.0: supports D2

to this:

    pci 0000:00:03.0: supports D1 D2

It also trivially converts a "dev_printk(KERN_INFO, ...)" to
"dev_info(...)".

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas
2008-08-22 09:37:02 -06:00
committed by Jesse Barnes
parent 2fd39aa7c2
commit c9ed77eeba
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/pci/pci.c
View File

@@ -1263,25 +1263,25 @@ void pci_pm_init(struct pci_dev *dev)
dev->d1_support = false; dev->d1_support = false;
dev->d2_support = false; dev->d2_support = false;
if (!pci_no_d1d2(dev)) { if (!pci_no_d1d2(dev)) {
if (pmc & PCI_PM_CAP_D1) { if (pmc & PCI_PM_CAP_D1)
dev_printk(KERN_DEBUG, &dev->dev, "supports D1\n");
dev->d1_support = true; dev->d1_support = true;
} if (pmc & PCI_PM_CAP_D2)
if (pmc & PCI_PM_CAP_D2) {
dev_printk(KERN_DEBUG, &dev->dev, "supports D2\n");
dev->d2_support = true; dev->d2_support = true;
}
if (dev->d1_support || dev->d2_support)
dev_printk(KERN_DEBUG, &dev->dev, "supports%s%s\n",
dev->d1_support ? " D1": "",
dev->d2_support ? " D2": "");
} }
pmc &= PCI_PM_CAP_PME_MASK; pmc &= PCI_PM_CAP_PME_MASK;
if (pmc) { if (pmc) {
dev_printk(KERN_INFO, &dev->dev, dev_info(&dev->dev, "PME# supported from%s%s%s%s%s\n",
"PME# supported from%s%s%s%s%s\n", (pmc & PCI_PM_CAP_PME_D0) ? " D0" : "",
(pmc & PCI_PM_CAP_PME_D0) ? " D0" : "", (pmc & PCI_PM_CAP_PME_D1) ? " D1" : "",
(pmc & PCI_PM_CAP_PME_D1) ? " D1" : "", (pmc & PCI_PM_CAP_PME_D2) ? " D2" : "",
(pmc & PCI_PM_CAP_PME_D2) ? " D2" : "", (pmc & PCI_PM_CAP_PME_D3) ? " D3hot" : "",
(pmc & PCI_PM_CAP_PME_D3) ? " D3hot" : "", (pmc & PCI_PM_CAP_PME_D3cold) ? " D3cold" : "");
(pmc & PCI_PM_CAP_PME_D3cold) ? " D3cold" : "");
dev->pme_support = pmc >> PCI_PM_CAP_PME_SHIFT; dev->pme_support = pmc >> PCI_PM_CAP_PME_SHIFT;
/* /*
* Make device's PM flags reflect the wake-up capability, but * Make device's PM flags reflect the wake-up capability, but