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

10 files changed, 53 insertions, 68 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 5cb40b2518f9..495059d923f7 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -23,7 +23,7 @@ void pci_add_resource_offset(struct list_head *resources, struct resource *res,
 
         entry = resource_list_create_entry(res, 0);
         if (!entry) {
-                printk(KERN_ERR "PCI: can't add host bridge window %pR\n", res);
+                pr_err("PCI: can't add host bridge window %pR\n", res);
                 return;
         }
 
@@ -288,8 +288,7 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx)
                 res->end = end;
                 res->flags &= ~IORESOURCE_UNSET;
                 orig_res.flags &= ~IORESOURCE_UNSET;
-                pci_printk(KERN_DEBUG, dev, "%pR clipped to %pR\n",
-                                 &orig_res, res);
+                pci_info(dev, "%pR clipped to %pR\n", &orig_res, res);
 
                 return true;
         }
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 03e02dd6c1d9..c5e1a097d7e3 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -139,8 +139,7 @@ static acpi_status decode_type0_hpx_record(union acpi_object *record,
                 hpx0->enable_perr     = fields[5].integer.value;
                 break;
         default:
-                printk(KERN_WARNING
-                       "%s: Type 0 Revision %d record not supported\n",
+                pr_warn("%s: Type 0 Revision %d record not supported\n",
                        __func__, revision);
                 return AE_ERROR;
         }
@@ -167,8 +166,7 @@ static acpi_status decode_type1_hpx_record(union acpi_object *record,
                 hpx1->tot_max_split = fields[4].integer.value;
                 break;
         default:
-                printk(KERN_WARNING
-                       "%s: Type 1 Revision %d record not supported\n",
+                pr_warn("%s: Type 1 Revision %d record not supported\n",
                        __func__, revision);
                 return AE_ERROR;
         }
@@ -208,8 +206,7 @@ static acpi_status decode_type2_hpx_record(union acpi_object *record,
                 hpx2->sec_unc_err_mask_or   = fields[17].integer.value;
                 break;
         default:
-                printk(KERN_WARNING
-                       "%s: Type 2 Revision %d record not supported\n",
+                pr_warn("%s: Type 2 Revision %d record not supported\n",
                        __func__, revision);
                 return AE_ERROR;
         }
@@ -339,7 +336,7 @@ static acpi_status acpi_run_hpx(struct pci_dev *dev, acpi_handle handle,
                                 goto exit;
                         break;
                 default:
-                        printk(KERN_ERR "%s: Type %d record not supported\n",
+                        pr_err("%s: Type %d record not supported\n",
                                __func__, type);
                         status = AE_ERROR;
                         goto exit;
diff --git a/drivers/pci/pci-stub.c b/drivers/pci/pci-stub.c
index 66f8a59fadbd..e408099fea52 100644
--- a/drivers/pci/pci-stub.c
+++ b/drivers/pci/pci-stub.c
@@ -66,20 +66,18 @@ static int __init pci_stub_init(void)
                                 &class, &class_mask);
 
                 if (fields < 2) {
-                        printk(KERN_WARNING
-                               "pci-stub: invalid id string \"%s\"\n", id);
+                        pr_warn("pci-stub: invalid ID string \"%s\"\n", id);
                         continue;
                 }
 
-                printk(KERN_INFO
-                       "pci-stub: add %04X:%04X sub=%04X:%04X cls=%08X/%08X\n",
+                pr_info("pci-stub: add %04X:%04X sub=%04X:%04X cls=%08X/%08X\n",
                        vendor, device, subvendor, subdevice, class, class_mask);
 
                 rc = pci_add_dynid(&stub_driver, vendor, device,
                                    subvendor, subdevice, class, class_mask, 0);
                 if (rc)
-                        printk(KERN_WARNING
-                               "pci-stub: failed to add dynamic id (%d)\n", rc);
+                        pr_warn("pci-stub: failed to add dynamic ID (%d)\n",
+                                rc);
         }
 
         return 0;
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 25794c27c7a4..6d27475e39b2 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1111,8 +1111,7 @@ legacy_io_err:
         kfree(b->legacy_io);
         b->legacy_io = NULL;
 kzalloc_err:
-        printk(KERN_WARNING "pci: warning: could not create legacy I/O port and ISA memory resources to sysfs\n");
-        return;
+        dev_warn(&b->dev, "could not create legacy I/O port and ISA memory resources in sysfs\n");
 }
 
 void pci_remove_legacy_files(struct pci_bus *b)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d185b49e105a..6a670aae89f4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2777,14 +2777,14 @@ void pci_pm_init(struct pci_dev *dev)
                         dev->d2_support = true;
 
                 if (dev->d1_support || dev->d2_support)
-                        pci_printk(KERN_DEBUG, dev, "supports%s%s\n",
+                        pci_info(dev, "supports%s%s\n",
                                    dev->d1_support ? " D1" : "",
                                    dev->d2_support ? " D2" : "");
         }
 
         pmc &= PCI_PM_CAP_PME_MASK;
         if (pmc) {
-                pci_printk(KERN_DEBUG, dev, "PME# supported from%s%s%s%s%s\n",
+                pci_info(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" : "",
@@ -2952,16 +2952,16 @@ static int pci_ea_read(struct pci_dev *dev, int offset)
         res->flags = flags;
 
         if (bei <= PCI_EA_BEI_BAR5)
-                pci_printk(KERN_DEBUG, dev, "BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n",
+                pci_info(dev, "BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n",
                            bei, res, prop);
         else if (bei == PCI_EA_BEI_ROM)
-                pci_printk(KERN_DEBUG, dev, "ROM: %pR (from Enhanced Allocation, properties %#02x)\n",
+                pci_info(dev, "ROM: %pR (from Enhanced Allocation, properties %#02x)\n",
                            res, prop);
         else if (bei >= PCI_EA_BEI_VF_BAR0 && bei <= PCI_EA_BEI_VF_BAR5)
-                pci_printk(KERN_DEBUG, dev, "VF BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n",
+                pci_info(dev, "VF BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n",
                            bei - PCI_EA_BEI_VF_BAR0, res, prop);
         else
-                pci_printk(KERN_DEBUG, dev, "BEI %d res: %pR (from Enhanced Allocation, properties %#02x)\n",
+                pci_info(dev, "BEI %d res: %pR (from Enhanced Allocation, properties %#02x)\n",
                            bei, res, prop);
 
 out:
@@ -4160,7 +4160,7 @@ int pci_set_cacheline_size(struct pci_dev *dev)
         if (cacheline_size == pci_cache_line_size)
                 return 0;
 
-        pci_printk(KERN_DEBUG, dev, "cache line size of %d is not supported\n",
+        pci_info(dev, "cache line size of %d is not supported\n",
                    pci_cache_line_size << 2);
 
         return -EINVAL;
@@ -6240,8 +6240,7 @@ static int __init pci_setup(char *str)
                                 disable_acs_redir_param =
                                         kstrdup(str + 18, GFP_KERNEL);
                         } else {
-                                printk(KERN_ERR "PCI: Unknown option `%s'\n",
-                                                str);
+                                pr_err("PCI: Unknown option `%s'\n", str);
                         }
                 }
                 str = k;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 0dc42f0eb66d..d3d407592c4c 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -317,7 +317,7 @@ fail:
         res->flags = 0;
 out:
         if (res->flags)
-                pci_printk(KERN_DEBUG, dev, "reg 0x%x: %pR\n", pos, res);
+                pci_info(dev, "reg 0x%x: %pR\n", pos, res);
 
         return (res->flags & IORESOURCE_MEM_64) ? 1 : 0;
 }
@@ -435,7 +435,7 @@ static void pci_read_bridge_io(struct pci_bus *child)
                 region.start = base;
                 region.end = limit + io_granularity - 1;
                 pcibios_bus_to_resource(dev->bus, res, &region);
-                pci_printk(KERN_DEBUG, dev, "  bridge window %pR\n", res);
+                pci_info(dev, "  bridge window %pR\n", res);
         }
 }
 
@@ -457,7 +457,7 @@ static void pci_read_bridge_mmio(struct pci_bus *child)
                 region.start = base;
                 region.end = limit + 0xfffff;
                 pcibios_bus_to_resource(dev->bus, res, &region);
-                pci_printk(KERN_DEBUG, dev, "  bridge window %pR\n", res);
+                pci_info(dev, "  bridge window %pR\n", res);
         }
 }
 
@@ -510,7 +510,7 @@ static void pci_read_bridge_mmio_pref(struct pci_bus *child)
                 region.start = base;
                 region.end = limit + 0xfffff;
                 pcibios_bus_to_resource(dev->bus, res, &region);
-                pci_printk(KERN_DEBUG, dev, "  bridge window %pR\n", res);
+                pci_info(dev, "  bridge window %pR\n", res);
         }
 }
 
@@ -540,8 +540,7 @@ void pci_read_bridge_bases(struct pci_bus *child)
                         if (res && res->flags) {
                                 pci_bus_add_resource(child, res,
                                                      PCI_SUBTRACTIVE_DECODE);
-                                pci_printk(KERN_DEBUG, dev,
-                                           "  bridge window %pR (subtractive decode)\n",
+                                pci_info(dev, "  bridge window %pR (subtractive decode)\n",
                                            res);
                         }
                 }
@@ -1743,7 +1742,7 @@ int pci_setup_device(struct pci_dev *dev)
         dev->revision = class & 0xff;
         dev->class = class >> 8;                    /* upper 3 bytes */
 
-        pci_printk(KERN_DEBUG, dev, "[%04x:%04x] type %02x class %#08x\n",
+        pci_info(dev, "[%04x:%04x] type %02x class %#08x\n",
                    dev->vendor, dev->device, dev->hdr_type, dev->class);
 
         if (pci_early_dump)
@@ -3249,7 +3248,7 @@ int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)
         conflict = request_resource_conflict(parent_res, res);
 
         if (conflict)
-                dev_printk(KERN_DEBUG, &b->dev,
+                dev_info(&b->dev,
                            "busn_res: can not insert %pR under %s%pR (conflicts with %s %pR)\n",
                             res, pci_is_root_bus(b) ? "domain " : "",
                             parent_res, conflict->name, conflict);
@@ -3269,8 +3268,7 @@ int pci_bus_update_busn_res_end(struct pci_bus *b, int bus_max)
 
         size = bus_max - res->start + 1;
         ret = adjust_resource(res, res->start, size);
-        dev_printk(KERN_DEBUG, &b->dev,
-                        "busn_res: %pR end %s updated to %02x\n",
+        dev_info(&b->dev, "busn_res: %pR end %s updated to %02x\n",
                         &old_res, ret ? "can not be" : "is", bus_max);
 
         if (!ret && !res->parent)
@@ -3288,8 +3286,7 @@ void pci_bus_release_busn_res(struct pci_bus *b)
                 return;
 
         ret = release_resource(res);
-        dev_printk(KERN_DEBUG, &b->dev,
-                        "busn_res: %pR %s released\n",
+        dev_info(&b->dev, "busn_res: %pR %s released\n",
                         res, ret ? "can not be" : "is");
 }
 
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);
         }
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index ec44a0f3a7ac..c73e66725d05 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -255,10 +255,9 @@ static void reassign_resources_sorted(struct list_head *realloc_head,
                                  (IORESOURCE_STARTALIGN|IORESOURCE_SIZEALIGN);
                         if (pci_reassign_resource(add_res->dev, idx,
                                                   add_size, align))
-                                pci_printk(KERN_DEBUG, add_res->dev,
-                                           "failed to add %llx res[%d]=%pR\n",
-                                           (unsigned long long)add_size,
-                                           idx, res);
+                                pci_info(add_res->dev, "failed to add %llx res[%d]=%pR\n",
+                                         (unsigned long long) add_size, idx,
+                                         res);
                 }
 out:
                 list_del(&add_res->list);
@@ -918,9 +917,9 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
         if (size1 > size0 && realloc_head) {
                 add_to_list(realloc_head, bus->self, b_res, size1-size0,
                             min_align);
-                pci_printk(KERN_DEBUG, bus->self, "bridge window %pR to %pR add_size %llx\n",
-                           b_res, &bus->busn_res,
-                           (unsigned long long)size1-size0);
+                pci_info(bus->self, "bridge window %pR to %pR add_size %llx\n",
+                         b_res, &bus->busn_res,
+                         (unsigned long long) size1 - size0);
         }
 }
 
@@ -1063,7 +1062,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
         b_res->flags |= IORESOURCE_STARTALIGN;
         if (size1 > size0 && realloc_head) {
                 add_to_list(realloc_head, bus->self, b_res, size1-size0, add_align);
-                pci_printk(KERN_DEBUG, bus->self, "bridge window %pR to %pR add_size %llx add_align %llx\n",
+                pci_info(bus->self, "bridge window %pR to %pR add_size %llx add_align %llx\n",
                            b_res, &bus->busn_res,
                            (unsigned long long) (size1 - size0),
                            (unsigned long long) add_align);
@@ -1531,8 +1530,8 @@ static void pci_bridge_release_resources(struct pci_bus *bus,
         release_child_resources(r);
         if (!release_resource(r)) {
                 type = old_flags = r->flags & PCI_RES_TYPE_MASK;
-                pci_printk(KERN_DEBUG, dev, "resource %d %pR released\n",
-                                        PCI_BRIDGE_RESOURCES + idx, r);
+                pci_info(dev, "resource %d %pR released\n",
+                         PCI_BRIDGE_RESOURCES + idx, r);
                 /* keep the old size */
                 r->end = resource_size(r) - 1;
                 r->start = 0;
@@ -1596,7 +1595,7 @@ static void pci_bus_dump_res(struct pci_bus *bus)
                 if (!res || !res->end || !res->flags)
                         continue;
 
-                dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pR\n", i, res);
+                dev_info(&bus->dev, "resource %d %pR\n", i, res);
         }
 }
 
@@ -1730,9 +1729,8 @@ void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus)
                 int max_depth = pci_bus_get_depth(bus);
 
                 pci_try_num = max_depth + 1;
-                dev_printk(KERN_DEBUG, &bus->dev,
-                           "max bus depth: %d pci_try_num: %d\n",
-                           max_depth, pci_try_num);
+                dev_info(&bus->dev, "max bus depth: %d pci_try_num: %d\n",
+                         max_depth, pci_try_num);
         }
 
 again:
@@ -1766,8 +1764,8 @@ again:
                 goto dump;
         }
 
-        dev_printk(KERN_DEBUG, &bus->dev,
-                   "No. %d try to assign unassigned res\n", tried_times + 1);
+        dev_info(&bus->dev, "No. %d try to assign unassigned res\n",
+                 tried_times + 1);
 
         /* third times and later will not check if it is leaf */
         if ((tried_times + 1) > 2)
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index c46d5e1ff536..f4d92b1afe7b 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -403,7 +403,7 @@ static int pci_slot_init(void)
         pci_slots_kset = kset_create_and_add("slots", NULL,
                                                 &pci_bus_kset->kobj);
         if (!pci_slots_kset) {
-                printk(KERN_ERR "PCI: Slot initialization failure\n");
+                pr_err("PCI: Slot initialization failure\n");
                 return -ENOMEM;
         }
         return 0;
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 14cf0f41ecf0..d1b16cf3403f 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -291,8 +291,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
                                 vector[i] = op.msix_entries[i].vector;
                         }
                 } else {
-                        printk(KERN_DEBUG "enable msix get value %x\n",
-                                op.value);
+                        pr_info("enable msix get value %x\n", op.value);
                         err = op.value;
                 }
         } else {
@@ -364,12 +363,12 @@ static void pci_frontend_disable_msi(struct pci_dev *dev)
         err = do_pci_op(pdev, &op);
         if (err == XEN_PCI_ERR_dev_not_found) {
                 /* XXX No response from backend, what shall we do? */
-                printk(KERN_DEBUG "get no response from backend for disable MSI\n");
+                pr_info("get no response from backend for disable MSI\n");
                 return;
         }
         if (err)
                 /* how can pciback notify us fail? */
-                printk(KERN_DEBUG "get fake response frombackend\n");
+                pr_info("get fake response from backend\n");
 }
 
 static struct xen_pci_frontend_ops pci_frontend_ops = {