Merge branch 'pci/printk'

* pci/printk:
  PCI: Replace dev_printk(KERN_DEBUG) with dev_info(), etc
  PCI: Replace printk(KERN_INFO) with pr_info(), etc
  PCI: Use dev_printk() when possible

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 9d32019411fd..b9489b329351 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -159,8 +159,7 @@ static int __init pci_apply_final_quirks(void)
         u8 tmp;
 
         if (pci_cache_line_size)
-                printk(KERN_DEBUG "PCI: CLS %u bytes\n",
-                       pci_cache_line_size << 2);
+                pr_info("PCI: CLS %u bytes\n", pci_cache_line_size << 2);
 
         pci_apply_fixup_final_quirks = true;
         for_each_pci_dev(dev) {
@@ -177,16 +176,16 @@ static int __init pci_apply_final_quirks(void)
                         if (!tmp || cls == tmp)
                                 continue;
 
-                        printk(KERN_DEBUG "PCI: CLS mismatch (%u != %u), using %u bytes\n",
-                               cls << 2, tmp << 2,
-                               pci_dfl_cache_line_size << 2);
+                        pci_info(dev, "CLS mismatch (%u != %u), using %u bytes\n",
+                                 cls << 2, tmp << 2,
+                                 pci_dfl_cache_line_size << 2);
                         pci_cache_line_size = pci_dfl_cache_line_size;
                 }
         }
 
         if (!pci_cache_line_size) {
-                printk(KERN_DEBUG "PCI: CLS %u bytes, default %u\n",
-                       cls << 2, pci_dfl_cache_line_size << 2);
+                pr_info("PCI: CLS %u bytes, default %u\n", cls << 2,
+                        pci_dfl_cache_line_size << 2);
                 pci_cache_line_size = cls ? cls : pci_dfl_cache_line_size;
         }
 
@@ -2613,7 +2612,7 @@ static void nvbridge_check_legacy_irq_routing(struct pci_dev *dev)
         pci_read_config_dword(dev, 0x74, &cfg);
 
         if (cfg & ((1 << 2) | (1 << 15))) {
-                printk(KERN_INFO "Rewriting IRQ routing register on MCP55\n");
+                pr_info("Rewriting IRQ routing register on MCP55\n");
                 cfg &= ~((1 << 2) | (1 << 15));
                 pci_write_config_dword(dev, 0x74, cfg);
         }