x86: Move ioapic_ids_setup to x86_init_ops

32bit and also the numaq code have special requirements on the
ioapic_id setup. Convert it to a x86_init_ops function and get rid
of the quirks and #ifdefs

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 5 insertions, 14 deletions

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index d2ed6c5ddc80..5f4687187ceb 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2014,7 +2014,7 @@ void disable_IO_APIC(void)
  * by Matt Domsch <Matt_Domsch@dell.com>  Tue Dec 21 12:25:05 CST 1999
  */
 
-static void __init setup_ioapic_ids_from_mpc(void)
+void __init setup_ioapic_ids_from_mpc(void)
 {
         union IO_APIC_reg_00 reg_00;
         physid_mask_t phys_id_present_map;
@@ -2023,9 +2023,8 @@ static void __init setup_ioapic_ids_from_mpc(void)
         unsigned char old_id;
         unsigned long flags;
 
-        if (x86_quirks->setup_ioapic_ids && x86_quirks->setup_ioapic_ids())
+        if (acpi_ioapic)
                 return;
-
         /*
          * Don't check I/O APIC IDs for xAPIC systems.  They have
          * no meaning without the serial APIC bus.
@@ -3061,10 +3060,8 @@ void __init setup_IO_APIC(void)
         /*
          * Set up IO-APIC IRQ routing.
          */
-#ifdef CONFIG_X86_32
-        if (!acpi_ioapic)
-                setup_ioapic_ids_from_mpc();
-#endif
+        x86_init.mpparse.setup_ioapic_ids();
+
         sync_Arb_IDs();
         setup_IO_APIC_irqs();
         init_IO_APIC_traps();
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index b5f0b1dc7dd0..f3717659265d 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -262,12 +262,6 @@ static void __init
         }
 }
 
-static int __init numaq_setup_ioapic_ids(void)
-{
-        /* so can skip it */
-        return 1;
-}
-
 static struct x86_quirks numaq_x86_quirks __initdata = {
         .arch_pre_time_init             = numaq_pre_time_init,
         .arch_time_init                 = NULL,
@@ -280,7 +274,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
         .mpc_oem_bus_info               = mpc_oem_bus_info,
         .mpc_oem_pci_bus                = mpc_oem_pci_bus,
         .smp_read_mpc_oem               = smp_read_mpc_oem,
-        .setup_ioapic_ids               = numaq_setup_ioapic_ids,
 };
 
 static __init void early_check_numaq(void)
@@ -299,6 +292,7 @@ static __init void early_check_numaq(void)
         if (found_numaq) {
                 x86_quirks = &numaq_x86_quirks;
                 x86_init.mpparse.mpc_record = numaq_mpc_record;
+                x86_init.mpparse.setup_ioapic_ids = x86_init_noop;
         }
 }