PCI/PM/Runtime: make PCI traces quieter

When the runtime PM is activated on PCI, if a device switches state
frequently (e.g. an EHCI controller with autosuspending USB devices
connected) the PCI configuration traces might be very verbose in the
kernel log.  Let's guard those traces with DEBUG condition.

Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 7f9eba9a0b02ce98a9a7bc9aa5ecf865ece618bf..0eefa12e648ca67f04aebaaaf0b1f3ade5095662 100644 (file)
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -487,10 +487,10 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
        else
                link_desc[0] = '\0';
 
-       dev_info(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n",
-                pin_name(pin), link_desc, gsi,
-                (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
-                (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
+       dev_dbg(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n",
+               pin_name(pin), link_desc, gsi,
+               (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
+               (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
 
        return 0;
 }
@@ -524,6 +524,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
         * (e.g. PCI_UNDEFINED_IRQ).
         */
 
-       dev_info(&dev->dev, "PCI INT %c disabled\n", pin_name(pin));
+       dev_dbg(&dev->dev, "PCI INT %c disabled\n", pin_name(pin));
        acpi_unregister_gsi(gsi);
 }

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5c5adef85bd70a439fedfe5d985f97fa812ba184..54343aa5b30a548f11e66f266373e53e07fcc323 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -973,7 +973,7 @@ void pci_restore_state(struct pci_dev *dev)
        for (i = 15; i >= 0; i--) {
                pci_read_config_dword(dev, i * 4, &val);
                if (val != dev->saved_config_space[i]) {
-                       dev_printk(KERN_DEBUG, &dev->dev, "restoring config "
+                       dev_dbg(&dev->dev, "restoring config "
                                "space at offset %#x (was %#x, writing %#x)\n",
                                i, val, (int)dev->saved_config_space[i]);
                        pci_write_config_dword(dev,i * 4,
@@ -1542,8 +1542,7 @@ void pci_pme_active(struct pci_dev *dev, bool enable)
        }
 
 out:
-       dev_printk(KERN_DEBUG, &dev->dev, "PME# %s\n",
-                       enable ? "enabled" : "disabled");
+       dev_dbg(&dev->dev, "PME# %s\n", enable ? "enabled" : "disabled");
 }
 
 /**

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 5717509becbea42ab3f0c8e44b9ae76893b2cd4c..b66bfdbd21f7aafa55f3ea9e6b4782bf29dc2f01 100644 (file)
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -85,9 +85,9 @@ void pci_update_resource(struct pci_dev *dev, int resno)
                }
        }
        res->flags &= ~IORESOURCE_UNSET;
-       dev_info(&dev->dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx])\n",
-                resno, res, (unsigned long long)region.start,
-                (unsigned long long)region.end);
+       dev_dbg(&dev->dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx])\n",
+               resno, res, (unsigned long long)region.start,
+               (unsigned long long)region.end);
 }
 
 int pci_claim_resource(struct pci_dev *dev, int resource)