x86: introduce x86_quirks

[pandora-kernel.git] / arch / x86 / mach-default / setup.c

diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 48278fa..631dbed 100644 (file)
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -10,14 +10,6 @@
 #include <asm/e820.h>
 #include <asm/setup.h>
 
-/*
- * Any quirks to be performed to initialize timers/irqs/etc?
- */
-int (*arch_time_init_quirk)(void);
-int (*arch_pre_intr_init_quirk)(void);
-int (*arch_intr_init_quirk)(void);
-int (*arch_trap_init_quirk)(void);
-
 #ifdef CONFIG_HOTPLUG_CPU
 #define DEFAULT_SEND_IPI       (1)
 #else
@@ -37,8 +29,8 @@ int no_broadcast=DEFAULT_SEND_IPI;
  **/
 void __init pre_intr_init_hook(void)
 {
-       if (arch_pre_intr_init_quirk) {
-               if (arch_pre_intr_init_quirk())
+       if (x86_quirks->arch_pre_intr_init) {
+               if (x86_quirks->arch_pre_intr_init())
                        return;
        }
        init_ISA_irqs();
@@ -64,8 +56,8 @@ static struct irqaction irq2 = {
  **/
 void __init intr_init_hook(void)
 {
-       if (arch_intr_init_quirk) {
-               if (arch_intr_init_quirk())
+       if (x86_quirks->arch_intr_init) {
+               if (x86_quirks->arch_intr_init())
                        return;
        }
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -97,8 +89,8 @@ void __init pre_setup_arch_hook(void)
  **/
 void __init trap_init_hook(void)
 {
-       if (arch_trap_init_quirk) {
-               if (arch_trap_init_quirk())
+       if (x86_quirks->arch_trap_init) {
+               if (x86_quirks->arch_trap_init())
                        return;
        }
 }
@@ -119,13 +111,13 @@ static struct irqaction irq0  = {
  **/
 void __init time_init_hook(void)
 {
-       if (arch_time_init_quirk) {
+       if (x86_quirks->arch_time_init) {
                /*
                 * A nonzero return code does not mean failure, it means
                 * that the architecture quirk does not want any
                 * generic (timer) setup to be performed after this:
                 */
-               if (arch_time_init_quirk())
+               if (x86_quirks->arch_time_init())
                        return;
        }