Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mohan Kumar and committed by
Bjorn Helgaas
25da8dba 7db4af43

+12 -18
+1 -1
drivers/pci/bus.c
··· 23 23 24 24 entry = resource_list_create_entry(res, 0); 25 25 if (!entry) { 26 - printk(KERN_ERR "PCI: can't add host bridge window %pR\n", res); 26 + pr_err("PCI: can't add host bridge window %pR\n", res); 27 27 return; 28 28 } 29 29
+4 -7
drivers/pci/pci-acpi.c
··· 140 140 hpx->t0->enable_perr = fields[5].integer.value; 141 141 break; 142 142 default: 143 - printk(KERN_WARNING 144 - "%s: Type 0 Revision %d record not supported\n", 143 + pr_warn("%s: Type 0 Revision %d record not supported\n", 145 144 __func__, revision); 146 145 return AE_ERROR; 147 146 } ··· 168 169 hpx->t1->tot_max_split = fields[4].integer.value; 169 170 break; 170 171 default: 171 - printk(KERN_WARNING 172 - "%s: Type 1 Revision %d record not supported\n", 172 + pr_warn("%s: Type 1 Revision %d record not supported\n", 173 173 __func__, revision); 174 174 return AE_ERROR; 175 175 } ··· 209 211 hpx->t2->sec_unc_err_mask_or = fields[17].integer.value; 210 212 break; 211 213 default: 212 - printk(KERN_WARNING 213 - "%s: Type 2 Revision %d record not supported\n", 214 + pr_warn("%s: Type 2 Revision %d record not supported\n", 214 215 __func__, revision); 215 216 return AE_ERROR; 216 217 } ··· 269 272 goto exit; 270 273 break; 271 274 default: 272 - printk(KERN_ERR "%s: Type %d record not supported\n", 275 + pr_err("%s: Type %d record not supported\n", 273 276 __func__, type); 274 277 status = AE_ERROR; 275 278 goto exit;
+4 -6
drivers/pci/pci-stub.c
··· 66 66 &class, &class_mask); 67 67 68 68 if (fields < 2) { 69 - printk(KERN_WARNING 70 - "pci-stub: invalid id string \"%s\"\n", id); 69 + pr_warn("pci-stub: invalid ID string \"%s\"\n", id); 71 70 continue; 72 71 } 73 72 74 - printk(KERN_INFO 75 - "pci-stub: add %04X:%04X sub=%04X:%04X cls=%08X/%08X\n", 73 + pr_info("pci-stub: add %04X:%04X sub=%04X:%04X cls=%08X/%08X\n", 76 74 vendor, device, subvendor, subdevice, class, class_mask); 77 75 78 76 rc = pci_add_dynid(&stub_driver, vendor, device, 79 77 subvendor, subdevice, class, class_mask, 0); 80 78 if (rc) 81 - printk(KERN_WARNING 82 - "pci-stub: failed to add dynamic id (%d)\n", rc); 79 + pr_warn("pci-stub: failed to add dynamic ID (%d)\n", 80 + rc); 83 81 } 84 82 85 83 return 0;
+1 -2
drivers/pci/pci.c
··· 6265 6265 disable_acs_redir_param = 6266 6266 kstrdup(str + 18, GFP_KERNEL); 6267 6267 } else { 6268 - printk(KERN_ERR "PCI: Unknown option `%s'\n", 6269 - str); 6268 + pr_err("PCI: Unknown option `%s'\n", str); 6270 6269 } 6271 6270 } 6272 6271 str = k;
+1 -1
drivers/pci/quirks.c
··· 2596 2596 pci_read_config_dword(dev, 0x74, &cfg); 2597 2597 2598 2598 if (cfg & ((1 << 2) | (1 << 15))) { 2599 - printk(KERN_INFO "Rewriting IRQ routing register on MCP55\n"); 2599 + pr_info("Rewriting IRQ routing register on MCP55\n"); 2600 2600 cfg &= ~((1 << 2) | (1 << 15)); 2601 2601 pci_write_config_dword(dev, 0x74, cfg); 2602 2602 }
+1 -1
drivers/pci/slot.c
··· 403 403 pci_slots_kset = kset_create_and_add("slots", NULL, 404 404 &pci_bus_kset->kobj); 405 405 if (!pci_slots_kset) { 406 - printk(KERN_ERR "PCI: Slot initialization failure\n"); 406 + pr_err("PCI: Slot initialization failure\n"); 407 407 return -ENOMEM; 408 408 } 409 409 return 0;