diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 03:43:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:20:12 +0100 |
| commit | 306db03b0d71bf9c94155c0c4771a79fc70b4b27 (patch) | |
| tree | 060e085368664f142013b65cbc0271a704b7dbc3 /arch/x86/mach-generic/es7000.c | |
| parent | 9a6801da55e4a4492e8f666ac272efe8186682c8 (diff) | |
| download | kernel_samsung_smdk4412-306db03b0d71bf9c94155c0c4771a79fc70b4b27.zip kernel_samsung_smdk4412-306db03b0d71bf9c94155c0c4771a79fc70b4b27.tar.gz kernel_samsung_smdk4412-306db03b0d71bf9c94155c0c4771a79fc70b4b27.tar.bz2 | |
x86: clean up apic->acpi_madt_oem_check methods
Impact: refactor code
x86 subarchitectures each defined a "acpi_madt_oem_check()" method,
which could be an inline function, or an extern, or a static function,
and which was also the name of a genapic field.
Untangle this namespace spaghetti by setting ->acpi_madt_oem_check()
to NULL on those subarchitectures that have no detection quirks,
and rename the other ones (summit, es7000) that do.
Also change default_acpi_madt_oem_check() to handle NULL entries,
and clean its control flow up as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-generic/es7000.c')
| -rw-r--r-- | arch/x86/mach-generic/es7000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c index 4a404ea..23fe6f1 100644 --- a/arch/x86/mach-generic/es7000.c +++ b/arch/x86/mach-generic/es7000.c @@ -57,7 +57,7 @@ mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) #ifdef CONFIG_ACPI /* Hook from generic ACPI tables.c */ -static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) +static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id) { unsigned long oem_addr = 0; int check_dsdt; @@ -81,7 +81,7 @@ static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) return ret; } #else -static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) +static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; } @@ -104,7 +104,7 @@ struct genapic apic_es7000 = { .name = "es7000", .probe = probe_es7000, - .acpi_madt_oem_check = acpi_madt_oem_check, + .acpi_madt_oem_check = es7000_acpi_madt_oem_check, .apic_id_registered = apic_id_registered, .int_delivery_mode = INT_DELIVERY_MODE, |