hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI / NUMA: Use pr_fmt() instead of printk 

Just do some cleanups to replace printk with pr_fmt().

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Hanjun Guo 2016-05-24 15:35:31 -07:00 committed by Rafael J. Wysocki
parent 1a695a905c
commit ac906a6d56
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/acpi/numa.c
View File

@ -18,6 +18,9 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* *
*/ */
#define pr_fmt(fmt) "ACPI: " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -28,8 +31,6 @@
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <linux/topology.h> #include <linux/topology.h>
#define PREFIX "ACPI: "
#define ACPI_NUMA 0x80000000 #define ACPI_NUMA 0x80000000
#define _COMPONENT ACPI_NUMA #define _COMPONENT ACPI_NUMA
ACPI_MODULE_NAME("numa"); ACPI_MODULE_NAME("numa");
@ -187,9 +188,8 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
#endif /* ACPI_DEBUG_OUTPUT */ #endif /* ACPI_DEBUG_OUTPUT */
break; break;
default: default:
printk(KERN_WARNING PREFIX pr_warn("Found unsupported SRAT entry (type = 0x%x)\n",
"Found unsupported SRAT entry (type = 0x%x)\n", header->type);
header->type);
break; break;
} }
} }
@ -222,7 +222,7 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
struct acpi_table_slit *slit = (struct acpi_table_slit *)table; struct acpi_table_slit *slit = (struct acpi_table_slit *)table;
if (!slit_valid(slit)) { if (!slit_valid(slit)) {
printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n"); pr_info("SLIT table looks invalid. Not used.\n");
return -EINVAL; return -EINVAL;
} }
acpi_numa_slit_init(slit); acpi_numa_slit_init(slit);
@ -233,12 +233,9 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
void __init __weak void __init __weak
acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
{ {
printk(KERN_WARNING PREFIX pr_warn("Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);
"Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);
return;
} }
static int __init static int __init
acpi_parse_x2apic_affinity(struct acpi_subtable_header *header, acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,
const unsigned long end) const unsigned long end)