android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Mohan Kumar 2019-04-20 07:03:46 +03:00 committed by Bjorn Helgaas
parent 7db4af43c9
commit 25da8dbaaf
6 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/bus.c
View File

@ -23,7 +23,7 @@ void pci_add_resource_offset(struct list_head *resources, struct resource *res,
entry = resource_list_create_entry(res, 0); entry = resource_list_create_entry(res, 0);
if (!entry) { 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; return;
} }

11
drivers/pci/pci-acpi.c
View File

@ -140,8 +140,7 @@ static acpi_status decode_type0_hpx_record(union acpi_object *record,
hpx->t0->enable_perr = fields[5].integer.value; hpx->t0->enable_perr = fields[5].integer.value;
break; break;
default: default:
printk(KERN_WARNING pr_warn("%s: Type 0 Revision %d record not supported\n",
"%s: Type 0 Revision %d record not supported\n",
__func__, revision); __func__, revision);
return AE_ERROR; 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; hpx->t1->tot_max_split = fields[4].integer.value;
break; break;
default: default:
printk(KERN_WARNING pr_warn("%s: Type 1 Revision %d record not supported\n",
"%s: Type 1 Revision %d record not supported\n",
__func__, revision); __func__, revision);
return AE_ERROR; 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; hpx->t2->sec_unc_err_mask_or = fields[17].integer.value;
break; break;
default: default:
printk(KERN_WARNING pr_warn("%s: Type 2 Revision %d record not supported\n",
"%s: Type 2 Revision %d record not supported\n",
__func__, revision); __func__, revision);
return AE_ERROR; return AE_ERROR;
} }
@ -272,7 +269,7 @@ static acpi_status acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)
goto exit; goto exit;
break; break;
default: default:
printk(KERN_ERR "%s: Type %d record not supported\n", pr_err("%s: Type %d record not supported\n",
__func__, type); __func__, type);
status = AE_ERROR; status = AE_ERROR;
goto exit; goto exit;

10
drivers/pci/pci-stub.c
View File

@ -66,20 +66,18 @@ static int __init pci_stub_init(void)
&class, &class_mask); &class, &class_mask);
if (fields < 2) { if (fields < 2) {
printk(KERN_WARNING pr_warn("pci-stub: invalid ID string \"%s\"\n", id);
"pci-stub: invalid id string \"%s\"\n", id);
continue; continue;
} }
printk(KERN_INFO pr_info("pci-stub: add %04X:%04X sub=%04X:%04X cls=%08X/%08X\n",
"pci-stub: add %04X:%04X sub=%04X:%04X cls=%08X/%08X\n",
vendor, device, subvendor, subdevice, class, class_mask); vendor, device, subvendor, subdevice, class, class_mask);
rc = pci_add_dynid(&stub_driver, vendor, device, rc = pci_add_dynid(&stub_driver, vendor, device,
subvendor, subdevice, class, class_mask, 0); subvendor, subdevice, class, class_mask, 0);
if (rc) if (rc)
printk(KERN_WARNING pr_warn("pci-stub: failed to add dynamic ID (%d)\n",
"pci-stub: failed to add dynamic id (%d)\n", rc); rc);
} }
return 0; return 0;

3
drivers/pci/pci.c
View File

@ -6265,8 +6265,7 @@ static int __init pci_setup(char *str)
disable_acs_redir_param = disable_acs_redir_param =
kstrdup(str + 18, GFP_KERNEL); kstrdup(str + 18, GFP_KERNEL);
} else { } else {
printk(KERN_ERR "PCI: Unknown option `%s'\n", pr_err("PCI: Unknown option `%s'\n", str);
str);
} }
} }
str = k; str = k;

2
drivers/pci/quirks.c
View File

@ -2596,7 +2596,7 @@ static void nvbridge_check_legacy_irq_routing(struct pci_dev *dev)
pci_read_config_dword(dev, 0x74, &cfg); pci_read_config_dword(dev, 0x74, &cfg);
if (cfg & ((1 << 2) | (1 << 15))) { 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)); cfg &= ~((1 << 2) | (1 << 15));
pci_write_config_dword(dev, 0x74, cfg); pci_write_config_dword(dev, 0x74, cfg);
} }

2
drivers/pci/slot.c
View File

@ -403,7 +403,7 @@ static int pci_slot_init(void)
pci_slots_kset = kset_create_and_add("slots", NULL, pci_slots_kset = kset_create_and_add("slots", NULL,
&pci_bus_kset->kobj); &pci_bus_kset->kobj);
if (!pci_slots_kset) { if (!pci_slots_kset) {
printk(KERN_ERR "PCI: Slot initialization failure\n"); pr_err("PCI: Slot initialization failure\n");
return -ENOMEM; return -ENOMEM;
} }
return 0; return 0;