aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@huawei.com>2012-06-22 02:55:22 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-06-22 17:18:05 -0400
commit24c97f04c4570e02c5cf4b97c73ab9dc27bacdbe (patch)
treea4ad2b9c63cf3b8c2ba9f5adf5f84c0eae03a5be /arch/x86
parent574a59414083df3911e5a1514742959b412b6947 (diff)
x86/PCI: use pr_level() to replace printk(KERN_LEVEL)
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/pci/mmconfig-shared.c21
-rw-r--r--arch/x86/pci/mmconfig_64.c3
2 files changed, 10 insertions, 14 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index ffe72b9d6869..937bcece7006 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -106,7 +106,7 @@ static __init struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
106 list_add_sorted(new); 106 list_add_sorted(new);
107 mutex_unlock(&pci_mmcfg_lock); 107 mutex_unlock(&pci_mmcfg_lock);
108 108
109 printk(KERN_INFO PREFIX 109 pr_info(PREFIX
110 "MMCONFIG for domain %04x [bus %02x-%02x] at %pR " 110 "MMCONFIG for domain %04x [bus %02x-%02x] at %pR "
111 "(base %#lx)\n", 111 "(base %#lx)\n",
112 segment, start, end, &new->res, (unsigned long)addr); 112 segment, start, end, &new->res, (unsigned long)addr);
@@ -362,8 +362,7 @@ static int __init pci_mmcfg_check_hostbridge(void)
362 name = pci_mmcfg_probes[i].probe(); 362 name = pci_mmcfg_probes[i].probe();
363 363
364 if (name) 364 if (name)
365 printk(KERN_INFO PREFIX "%s with MMCONFIG support\n", 365 pr_info(PREFIX "%s with MMCONFIG support\n", name);
366 name);
367 } 366 }
368 367
369 /* some end_bus_number is crazy, fix it */ 368 /* some end_bus_number is crazy, fix it */
@@ -465,8 +464,7 @@ static int __ref is_mmconf_reserved(check_reserved_t is_reserved,
465 dev_info(dev, "MMCONFIG at %pR reserved in %s\n", 464 dev_info(dev, "MMCONFIG at %pR reserved in %s\n",
466 &cfg->res, method); 465 &cfg->res, method);
467 else 466 else
468 printk(KERN_INFO PREFIX 467 pr_info(PREFIX "MMCONFIG at %pR reserved in %s\n",
469 "MMCONFIG at %pR reserved in %s\n",
470 &cfg->res, method); 468 &cfg->res, method);
471 469
472 if (old_size != size) { 470 if (old_size != size) {
@@ -485,7 +483,7 @@ static int __ref is_mmconf_reserved(check_reserved_t is_reserved,
485 "at %pR (base %#lx) (size reduced!)\n", 483 "at %pR (base %#lx) (size reduced!)\n",
486 &cfg->res, (unsigned long) cfg->address); 484 &cfg->res, (unsigned long) cfg->address);
487 else 485 else
488 printk(KERN_INFO PREFIX 486 pr_info(PREFIX
489 "MMCONFIG for %04x [bus%02x-%02x] " 487 "MMCONFIG for %04x [bus%02x-%02x] "
490 "at %pR (base %#lx) (size reduced!)\n", 488 "at %pR (base %#lx) (size reduced!)\n",
491 cfg->segment, cfg->start_bus, cfg->end_bus, 489 cfg->segment, cfg->start_bus, cfg->end_bus,
@@ -508,7 +506,7 @@ static int __ref pci_mmcfg_check_reserved(struct device *dev,
508 "ACPI motherboard resources\n", 506 "ACPI motherboard resources\n",
509 &cfg->res); 507 &cfg->res);
510 else 508 else
511 printk(KERN_INFO FW_INFO PREFIX 509 pr_info(FW_INFO PREFIX
512 "MMCONFIG at %pR not reserved in " 510 "MMCONFIG at %pR not reserved in "
513 "ACPI motherboard resources\n", 511 "ACPI motherboard resources\n",
514 &cfg->res); 512 &cfg->res);
@@ -537,7 +535,7 @@ static void __init pci_mmcfg_reject_broken(int early)
537 535
538 list_for_each_entry(cfg, &pci_mmcfg_list, list) { 536 list_for_each_entry(cfg, &pci_mmcfg_list, list) {
539 if (pci_mmcfg_check_reserved(NULL, cfg, early) == 0) { 537 if (pci_mmcfg_check_reserved(NULL, cfg, early) == 0) {
540 printk(KERN_INFO PREFIX "not using MMCONFIG\n"); 538 pr_info(PREFIX "not using MMCONFIG\n");
541 free_all_mmcfg(); 539 free_all_mmcfg();
542 return; 540 return;
543 } 541 }
@@ -562,7 +560,7 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
562 return 0; 560 return 0;
563 } 561 }
564 562
565 printk(KERN_ERR PREFIX "MCFG region for %04x [bus %02x-%02x] at %#llx " 563 pr_err(PREFIX "MCFG region for %04x [bus %02x-%02x] at %#llx "
566 "is above 4GB, ignored\n", cfg->pci_segment, 564 "is above 4GB, ignored\n", cfg->pci_segment,
567 cfg->start_bus_number, cfg->end_bus_number, cfg->address); 565 cfg->start_bus_number, cfg->end_bus_number, cfg->address);
568 return -EINVAL; 566 return -EINVAL;
@@ -589,7 +587,7 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
589 i -= sizeof(struct acpi_mcfg_allocation); 587 i -= sizeof(struct acpi_mcfg_allocation);
590 }; 588 };
591 if (entries == 0) { 589 if (entries == 0) {
592 printk(KERN_ERR PREFIX "MMCONFIG has no entries\n"); 590 pr_err(PREFIX "MMCONFIG has no entries\n");
593 return -ENODEV; 591 return -ENODEV;
594 } 592 }
595 593
@@ -603,8 +601,7 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
603 601
604 if (pci_mmconfig_add(cfg->pci_segment, cfg->start_bus_number, 602 if (pci_mmconfig_add(cfg->pci_segment, cfg->start_bus_number,
605 cfg->end_bus_number, cfg->address) == NULL) { 603 cfg->end_bus_number, cfg->address) == NULL) {
606 printk(KERN_WARNING PREFIX 604 pr_warn(PREFIX "no memory for MCFG entries\n");
607 "no memory for MCFG entries\n");
608 free_all_mmcfg(); 605 free_all_mmcfg();
609 return -ENOMEM; 606 return -ENOMEM;
610 } 607 }
diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
index c206521fe98e..d4ebd07c306d 100644
--- a/arch/x86/pci/mmconfig_64.c
+++ b/arch/x86/pci/mmconfig_64.c
@@ -137,8 +137,7 @@ int __devinit pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg)
137{ 137{
138 cfg->virt = mcfg_ioremap(cfg); 138 cfg->virt = mcfg_ioremap(cfg);
139 if (!cfg->virt) { 139 if (!cfg->virt) {
140 printk(KERN_ERR PREFIX "can't map MMCONFIG at %pR\n", 140 pr_err(PREFIX "can't map MMCONFIG at %pR\n", &cfg->res);
141 &cfg->res);
142 return -ENOMEM; 141 return -ENOMEM;
143 } 142 }
144 143