PCI: Replace printk(KERN_INFO) with pr_info(), etc

Replace printk() with pr_*() to be more consistent with other logging and
avoid checkpatch warnings.

Link: https://lore.kernel.org/lkml/1555733026-19609-1-git-send-email-mohankumar718@gmail.com
Link: https://lore.kernel.org/lkml/1555733130-19804-1-git-send-email-mohankumar718@gmail.com
Signed-off-by: Mohan Kumar <mohankumar718@gmail.com>
[bhelgaas: squash in similar changes from second patch in series]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 5cb40b2518f9376dbe7edd4bf11d303daf97c025..2179a8baef523112c153ea8a7d7d65cb8c19b7b8 100644 (file)
--- 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;
        }
 

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index e1949f7efd9c05eeb400f69fa34ee4416cbfee37..3ada0266974c5adf22d1ab4192499d70677b78e5 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -140,8 +140,7 @@ static acpi_status decode_type0_hpx_record(union acpi_object *record,
                hpx->t0->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;
        }
@@ -169,8 +168,7 @@ static acpi_status decode_type1_hpx_record(union acpi_object *record,
                hpx->t1->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;
        }
@@ -211,8 +209,7 @@ static acpi_status decode_type2_hpx_record(union acpi_object *record,
                hpx->t2->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;
        }
@@ -272,7 +269,7 @@ static acpi_status acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)
                                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 66f8a59fadbd90496196f0e6ba4eef3baeee75be..e408099fea5257dfe3218282d138615d966ab2f0 100644 (file)
--- 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.c b/drivers/pci/pci.c
index 7c1b362f599aebc4bbf66acb09fe67fb5d76ea39..225145ba4cf3e8fc50c513b50567714dc2fbfc7a 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -6265,8 +6265,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/quirks.c b/drivers/pci/quirks.c
index 0f0f73ff9ee245827dddf6e7ac4467f2e6ec5466..8d1135ca330f6d25ebbd9bf1ce8dc407c77631e5 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2596,7 +2596,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/slot.c b/drivers/pci/slot.c
index c46d5e1ff53692ebeafaee1d4e745d4743a4c78a..f4d92b1afe7b02c7ebf783826331f950a0063e9d 100644 (file)
--- 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;