Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: coding style fixes to arch/x86/mach-generic/probe.c

Browse Source 
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>
This commit is contained in:
Paolo Ciarrocchi 2008-02-19 23:57:17 +01:00 committed by Ingo Molnar
parent d4413732b5
commit 9b0c502882
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
arch/x86/mach-generic/probe.c
View File

@ -1,8 +1,9 @@
/* Copyright 2003 Andi Kleen, SuSE Labs. /*
* Subject to the GNU Public License, v.2 * Copyright 2003 Andi Kleen, SuSE Labs.
* * Subject to the GNU Public License, v.2
*
* Generic x86 APIC driver probe layer. * Generic x86 APIC driver probe layer.
*/ */
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/string.h> #include <linux/string.h>
@ -24,7 +25,7 @@ struct genapic *genapic = &apic_default;
static struct genapic *apic_probe[] __initdata = { static struct genapic *apic_probe[] __initdata = {
&apic_summit, &apic_summit,
&apic_bigsmp, &apic_bigsmp,
&apic_es7000, &apic_es7000,
&apic_default, /* must be last */ &apic_default, /* must be last */
NULL, NULL,
@ -69,7 +70,7 @@ void __init generic_bigsmp_probe(void)
} }
void __init generic_apic_probe(void) void __init generic_apic_probe(void)
{ {
if (!cmdline_apic) { if (!cmdline_apic) {
int i; int i;
for (i = 0; apic_probe[i]; i++) { for (i = 0; apic_probe[i]; i++) {
@ -83,40 +84,40 @@ void __init generic_apic_probe(void)
panic("Didn't find an APIC driver"); panic("Didn't find an APIC driver");
} }
printk(KERN_INFO "Using APIC driver %s\n", genapic->name); printk(KERN_INFO "Using APIC driver %s\n", genapic->name);
} }
/* These functions can switch the APIC even after the initial ->probe() */ /* These functions can switch the APIC even after the initial ->probe() */
int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid) int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
{ {
int i; int i;
for (i = 0; apic_probe[i]; ++i) { for (i = 0; apic_probe[i]; ++i) {
if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) { if (apic_probe[i]->mps_oem_check(mpc, oem, productid)) {
if (!cmdline_apic) { if (!cmdline_apic) {
genapic = apic_probe[i]; genapic = apic_probe[i];
printk(KERN_INFO "Switched to APIC driver `%s'.\n", printk(KERN_INFO "Switched to APIC driver `%s'.\n",
genapic->name); genapic->name);
} }
return 1; return 1;
} }
} }
return 0; return 0;
} }
int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{ {
int i; int i;
for (i = 0; apic_probe[i]; ++i) { for (i = 0; apic_probe[i]; ++i) {
if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) {
if (!cmdline_apic) { if (!cmdline_apic) {
genapic = apic_probe[i]; genapic = apic_probe[i];
printk(KERN_INFO "Switched to APIC driver `%s'.\n", printk(KERN_INFO "Switched to APIC driver `%s'.\n",
genapic->name); genapic->name);
} }
return 1; return 1;
} }
} }
return 0; return 0;
} }
int hard_smp_processor_id(void) int hard_smp_processor_id(void)