aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-generic
diff options
context:
space:
mode:
authorPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>2008-02-19 17:57:17 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:48 -0400
commit9b0c5028825df9d99a430c9963c45e02a2b185c6 (patch)
tree64f3797a9d785fed0d6e651ef7d1c08fb051d946 /arch/x86/mach-generic
parentd4413732b54a17684e48fbb4b52fade5bf965b5d (diff)
x86: coding style fixes to arch/x86/mach-generic/probe.c
The patch kills 20 errors and a few warnings. arch/x86/mach-generic/probe.o: text data bss dec hex filename 578 45 0 623 26f probe.o.before 578 45 0 623 26f probe.o.after md5: 86eb1c3e3cf37f81d37bcd9a0c9f14ad probe.o.before.asm 86eb1c3e3cf37f81d37bcd9a0c9f14ad probe.o.after.asm Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-generic')
-rw-r--r--arch/x86/mach-generic/probe.c37
1 files changed, 19 insertions, 18 deletions
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index f410d3cb5659..c5ae751b994a 100644
--- a/arch/x86/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
@@ -1,8 +1,9 @@
1/* Copyright 2003 Andi Kleen, SuSE Labs. 1/*
2 * Subject to the GNU Public License, v.2 2 * Copyright 2003 Andi Kleen, SuSE Labs.
3 * 3 * Subject to the GNU Public License, v.2
4 *
4 * Generic x86 APIC driver probe layer. 5 * Generic x86 APIC driver probe layer.
5 */ 6 */
6#include <linux/threads.h> 7#include <linux/threads.h>
7#include <linux/cpumask.h> 8#include <linux/cpumask.h>
8#include <linux/string.h> 9#include <linux/string.h>
@@ -24,7 +25,7 @@ struct genapic *genapic = &apic_default;
24 25
25static struct genapic *apic_probe[] __initdata = { 26static struct genapic *apic_probe[] __initdata = {
26 &apic_summit, 27 &apic_summit,
27 &apic_bigsmp, 28 &apic_bigsmp,
28 &apic_es7000, 29 &apic_es7000,
29 &apic_default, /* must be last */ 30 &apic_default, /* must be last */
30 NULL, 31 NULL,
@@ -69,7 +70,7 @@ void __init generic_bigsmp_probe(void)
69} 70}
70 71
71void __init generic_apic_probe(void) 72void __init generic_apic_probe(void)
72{ 73{
73 if (!cmdline_apic) { 74 if (!cmdline_apic) {
74 int i; 75 int i;
75 for (i = 0; apic_probe[i]; i++) { 76 for (i = 0; apic_probe[i]; i++) {
@@ -83,40 +84,40 @@ void __init generic_apic_probe(void)
83 panic("Didn't find an APIC driver"); 84 panic("Didn't find an APIC driver");
84 } 85 }
85 printk(KERN_INFO "Using APIC driver %s\n", genapic->name); 86 printk(KERN_INFO "Using APIC driver %s\n", genapic->name);
86} 87}
87 88
88/* These functions can switch the APIC even after the initial ->probe() */ 89/* These functions can switch the APIC even after the initial ->probe() */
89 90
90int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid) 91int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
91{ 92{
92 int i; 93 int i;
93 for (i = 0; apic_probe[i]; ++i) { 94 for (i = 0; apic_probe[i]; ++i) {
94 if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) { 95 if (apic_probe[i]->mps_oem_check(mpc, oem, productid)) {
95 if (!cmdline_apic) { 96 if (!cmdline_apic) {
96 genapic = apic_probe[i]; 97 genapic = apic_probe[i];
97 printk(KERN_INFO "Switched to APIC driver `%s'.\n", 98 printk(KERN_INFO "Switched to APIC driver `%s'.\n",
98 genapic->name); 99 genapic->name);
99 } 100 }
100 return 1; 101 return 1;
101 } 102 }
102 } 103 }
103 return 0; 104 return 0;
104} 105}
105 106
106int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) 107int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
107{ 108{
108 int i; 109 int i;
109 for (i = 0; apic_probe[i]; ++i) { 110 for (i = 0; apic_probe[i]; ++i) {
110 if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { 111 if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) {
111 if (!cmdline_apic) { 112 if (!cmdline_apic) {
112 genapic = apic_probe[i]; 113 genapic = apic_probe[i];
113 printk(KERN_INFO "Switched to APIC driver `%s'.\n", 114 printk(KERN_INFO "Switched to APIC driver `%s'.\n",
114 genapic->name); 115 genapic->name);
115 } 116 }
116 return 1; 117 return 1;
117 } 118 }
118 } 119 }
119 return 0; 120 return 0;
120} 121}
121 122
122int hard_smp_processor_id(void) 123int hard_smp_processor_id(void)