x86, ioapic: Consolidate mp_ioapics[] into 'struct ioapic'

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: daniel.blueman@gmail.com
Link: http://lkml.kernel.org/r/20110518233157.909013179@sbsiddha-MOBL3.sc.intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 9a966c579af5..4558f0d0822d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -970,7 +970,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
         mp_irq.irqflag = (trigger << 2) | polarity;
         mp_irq.srcbus = MP_ISA_BUS;
         mp_irq.srcbusirq = bus_irq;     /* IRQ */
-        mp_irq.dstapic = mp_ioapics[ioapic].apicid; /* APIC ID */
+        mp_irq.dstapic = mpc_ioapic_id(ioapic); /* APIC ID */
         mp_irq.dstirq = pin;    /* INTIN# */
 
         mp_save_irq(&mp_irq);
@@ -1021,7 +1021,7 @@ void __init mp_config_acpi_legacy_irqs(void)
                 if (ioapic < 0)
                         continue;
                 pin = mp_find_ioapic_pin(ioapic, gsi);
-                dstapic = mp_ioapics[ioapic].apicid;
+                dstapic = mpc_ioapic_id(ioapic);
 
                 for (idx = 0; idx < mp_irq_entries; idx++) {
                         struct mpc_intsrc *irq = mp_irqs + idx;
@@ -1082,7 +1082,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
         mp_irq.srcbus = number;
         mp_irq.srcbusirq = (((devfn >> 3) & 0x1f) << 2) | ((pin - 1) & 3);
         ioapic = mp_find_ioapic(gsi);
-        mp_irq.dstapic = mp_ioapics[ioapic].apicid;
+        mp_irq.dstapic = mpc_ioapic_id(ioapic);
         mp_irq.dstirq = mp_find_ioapic_pin(ioapic, gsi);
 
         mp_save_irq(&mp_irq);
@@ -1113,7 +1113,7 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
 
         if (ioapic_pin > MP_MAX_IOAPIC_PIN) {
                 printk(KERN_ERR "Invalid reference to IOAPIC pin "
-                       "%d-%d\n", mp_ioapics[ioapic].apicid,
+                       "%d-%d\n", mpc_ioapic_id(ioapic),
                        ioapic_pin);
                 return gsi;
         }