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>

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