aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-08-22 11:37:02 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-20 13:53:46 -0400
commitc9ed77eeba8ec2541a40918210bcc676acacd43a (patch)
tree87c6d58b189a6e9cf95dcebca8013586774a3284
parent2fd39aa7c2f3d696814abb3e8962c759eee484f3 (diff)
PCI: tidy PME support messages
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>
-rw-r--r--drivers/pci/pci.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 2797112c9400..e1a17b85447b 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1263,25 +1263,25 @@ void pci_pm_init(struct pci_dev *dev)
1263 dev->d1_support = false; 1263 dev->d1_support = false;
1264 dev->d2_support = false; 1264 dev->d2_support = false;
1265 if (!pci_no_d1d2(dev)) { 1265 if (!pci_no_d1d2(dev)) {
1266 if (pmc & PCI_PM_CAP_D1) { 1266 if (pmc & PCI_PM_CAP_D1)
1267 dev_printk(KERN_DEBUG, &dev->dev, "supports D1\n");
1268 dev->d1_support = true; 1267 dev->d1_support = true;
1269 } 1268 if (pmc & PCI_PM_CAP_D2)
1270 if (pmc & PCI_PM_CAP_D2) {
1271 dev_printk(KERN_DEBUG, &dev->dev, "supports D2\n");
1272 dev->d2_support = true; 1269 dev->d2_support = true;
1273 } 1270
1271 if (dev->d1_support || dev->d2_support)
1272 dev_printk(KERN_DEBUG, &dev->dev, "supports%s%s\n",
1273 dev->d1_support ? " D1": "",
1274 dev->d2_support ? " D2": "");
1274 } 1275 }
1275 1276
1276 pmc &= PCI_PM_CAP_PME_MASK; 1277 pmc &= PCI_PM_CAP_PME_MASK;
1277 if (pmc) { 1278 if (pmc) {
1278 dev_printk(KERN_INFO, &dev->dev, 1279 dev_info(&dev->dev, "PME# supported from%s%s%s%s%s\n",
1279 "PME# supported from%s%s%s%s%s\n", 1280 (pmc & PCI_PM_CAP_PME_D0) ? " D0" : "",
1280 (pmc & PCI_PM_CAP_PME_D0) ? " D0" : "", 1281 (pmc & PCI_PM_CAP_PME_D1) ? " D1" : "",
1281 (pmc & PCI_PM_CAP_PME_D1) ? " D1" : "", 1282 (pmc & PCI_PM_CAP_PME_D2) ? " D2" : "",
1282 (pmc & PCI_PM_CAP_PME_D2) ? " D2" : "", 1283 (pmc & PCI_PM_CAP_PME_D3) ? " D3hot" : "",
1283 (pmc & PCI_PM_CAP_PME_D3) ? " D3hot" : "", 1284 (pmc & PCI_PM_CAP_PME_D3cold) ? " D3cold" : "");
1284 (pmc & PCI_PM_CAP_PME_D3cold) ? " D3cold" : "");
1285 dev->pme_support = pmc >> PCI_PM_CAP_PME_SHIFT; 1285 dev->pme_support = pmc >> PCI_PM_CAP_PME_SHIFT;
1286 /* 1286 /*
1287 * Make device's PM flags reflect the wake-up capability, but 1287 * Make device's PM flags reflect the wake-up capability, but