lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: es7000_32.c: Use pr_<level> and add pr_fmt(fmt)

Browse Source 
- Added #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 - Converted a few printk(KERN_INFO to pr_info(
 - Stripped "es7000_mipcfg" from pr_debug

Signed-off-by: Joe Perches <joe@perches.com>
LKML-Reference: <3b4375af246dec5941168858910210937c110af9.1260383912.git.joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Joe Perches
2009-12-09 10:45:33 -08:00
committed by Ingo Molnar
parent a1884b8e55
commit 5cd476effe
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/kernel/apic/es7000_32.c
View File

@@ -27,6 +27,9 @@
* *
* http://www.unisys.com * http://www.unisys.com
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
@@ -223,9 +226,9 @@ static int parse_unisys_oem(char *oemptr)
mip_addr = val; mip_addr = val;
mip = (struct mip_reg *)val; mip = (struct mip_reg *)val;
mip_reg = __va(mip); mip_reg = __va(mip);
pr_debug("es7000_mipcfg: host_reg = 0x%lx \n", pr_debug("host_reg = 0x%lx\n",
(unsigned long)host_reg); (unsigned long)host_reg);
pr_debug("es7000_mipcfg: mip_reg = 0x%lx \n", pr_debug("mip_reg = 0x%lx\n",
(unsigned long)mip_reg); (unsigned long)mip_reg);
success++; success++;
break; break;
@@ -401,7 +404,7 @@ static void es7000_enable_apic_mode(void)
if (!es7000_plat) if (!es7000_plat)
return; return;
printk(KERN_INFO "ES7000: Enabling APIC mode.\n"); pr_info("Enabling APIC mode.\n");
memset(&es7000_mip_reg, 0, sizeof(struct mip_reg)); memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
es7000_mip_reg.off_0x00 = MIP_SW_APIC; es7000_mip_reg.off_0x00 = MIP_SW_APIC;
es7000_mip_reg.off_0x38 = MIP_VALID; es7000_mip_reg.off_0x38 = MIP_VALID;
@@ -514,8 +517,7 @@ static void es7000_setup_apic_routing(void)
{ {
int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id()); int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id());
printk(KERN_INFO pr_info("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
"Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
(apic_version[apic] == 0x14) ? (apic_version[apic] == 0x14) ?
"Physical Cluster" : "Logical Cluster", "Physical Cluster" : "Logical Cluster",
nr_ioapics, cpumask_bits(es7000_target_cpus())[0]); nr_ioapics, cpumask_bits(es7000_target_cpus())[0]);