Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac906a6d authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

ACPI / NUMA: Use pr_fmt() instead of printk 



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

Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1a695a90

drivers/acpi/numa.c

+7 −10
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *

 */



#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/module.h>

#include <linux/init.h>

#include <linux/kernel.h>
@@ -28,8 +31,6 @@ 
#include <linux/nodemask.h>

#include <linux/topology.h>



#define PREFIX "ACPI: "



#define ACPI_NUMA	0x80000000

#define _COMPONENT	ACPI_NUMA

ACPI_MODULE_NAME("numa");
@@ -187,8 +188,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) 
#endif				/* ACPI_DEBUG_OUTPUT */

		break;

	default:

		printk(KERN_WARNING PREFIX

		       "Found unsupported SRAT entry (type = 0x%x)\n",

		pr_warn("Found unsupported SRAT entry (type = 0x%x)\n",

			header->type);

		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;



	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;

	}

	acpi_numa_slit_init(slit);
@@ -233,12 +233,9 @@ static int __init acpi_parse_slit(struct acpi_table_header *table) 
void __init __weak

acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)

{

	printk(KERN_WARNING PREFIX

	       "Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);

	return;

	pr_warn("Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);

}





static int __init

acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,

			   const unsigned long end)