Skip to content

Commit

Permalink
x86/PCI: use pr_level() to replace printk(KERN_LEVEL)
Browse files Browse the repository at this point in the history
Script checkpatch.pl recommends to replace printk(KERN_LVL) with pr_lvl(),
so do it.

Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jiang Liu <liuj97@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Jiang Liu authored and Bjorn Helgaas committed Jun 22, 2012
1 parent 574a594 commit 24c97f0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
21 changes: 9 additions & 12 deletions arch/x86/pci/mmconfig-shared.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static __init struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
list_add_sorted(new);
mutex_unlock(&pci_mmcfg_lock);

printk(KERN_INFO PREFIX
pr_info(PREFIX
"MMCONFIG for domain %04x [bus %02x-%02x] at %pR "
"(base %#lx)\n",
segment, start, end, &new->res, (unsigned long)addr);
Expand Down Expand Up @@ -362,8 +362,7 @@ static int __init pci_mmcfg_check_hostbridge(void)
name = pci_mmcfg_probes[i].probe();

if (name)
printk(KERN_INFO PREFIX "%s with MMCONFIG support\n",
name);
pr_info(PREFIX "%s with MMCONFIG support\n", name);
}

/* some end_bus_number is crazy, fix it */
Expand Down Expand Up @@ -465,8 +464,7 @@ static int __ref is_mmconf_reserved(check_reserved_t is_reserved,
dev_info(dev, "MMCONFIG at %pR reserved in %s\n",
&cfg->res, method);
else
printk(KERN_INFO PREFIX
"MMCONFIG at %pR reserved in %s\n",
pr_info(PREFIX "MMCONFIG at %pR reserved in %s\n",
&cfg->res, method);

if (old_size != size) {
Expand All @@ -485,7 +483,7 @@ static int __ref is_mmconf_reserved(check_reserved_t is_reserved,
"at %pR (base %#lx) (size reduced!)\n",
&cfg->res, (unsigned long) cfg->address);
else
printk(KERN_INFO PREFIX
pr_info(PREFIX
"MMCONFIG for %04x [bus%02x-%02x] "
"at %pR (base %#lx) (size reduced!)\n",
cfg->segment, cfg->start_bus, cfg->end_bus,
Expand All @@ -508,7 +506,7 @@ static int __ref pci_mmcfg_check_reserved(struct device *dev,
"ACPI motherboard resources\n",
&cfg->res);
else
printk(KERN_INFO FW_INFO PREFIX
pr_info(FW_INFO PREFIX
"MMCONFIG at %pR not reserved in "
"ACPI motherboard resources\n",
&cfg->res);
Expand Down Expand Up @@ -537,7 +535,7 @@ static void __init pci_mmcfg_reject_broken(int early)

list_for_each_entry(cfg, &pci_mmcfg_list, list) {
if (pci_mmcfg_check_reserved(NULL, cfg, early) == 0) {
printk(KERN_INFO PREFIX "not using MMCONFIG\n");
pr_info(PREFIX "not using MMCONFIG\n");
free_all_mmcfg();
return;
}
Expand All @@ -562,7 +560,7 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
return 0;
}

printk(KERN_ERR PREFIX "MCFG region for %04x [bus %02x-%02x] at %#llx "
pr_err(PREFIX "MCFG region for %04x [bus %02x-%02x] at %#llx "
"is above 4GB, ignored\n", cfg->pci_segment,
cfg->start_bus_number, cfg->end_bus_number, cfg->address);
return -EINVAL;
Expand All @@ -589,7 +587,7 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
i -= sizeof(struct acpi_mcfg_allocation);
};
if (entries == 0) {
printk(KERN_ERR PREFIX "MMCONFIG has no entries\n");
pr_err(PREFIX "MMCONFIG has no entries\n");
return -ENODEV;
}

Expand All @@ -603,8 +601,7 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)

if (pci_mmconfig_add(cfg->pci_segment, cfg->start_bus_number,
cfg->end_bus_number, cfg->address) == NULL) {
printk(KERN_WARNING PREFIX
"no memory for MCFG entries\n");
pr_warn(PREFIX "no memory for MCFG entries\n");
free_all_mmcfg();
return -ENOMEM;
}
Expand Down
3 changes: 1 addition & 2 deletions arch/x86/pci/mmconfig_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ int __devinit pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg)
{
cfg->virt = mcfg_ioremap(cfg);
if (!cfg->virt) {
printk(KERN_ERR PREFIX "can't map MMCONFIG at %pR\n",
&cfg->res);
pr_err(PREFIX "can't map MMCONFIG at %pR\n", &cfg->res);
return -ENOMEM;
}

Expand Down

0 comments on commit 24c97f0

Please sign in to comment.