1 files changed, 2 insertions, 13 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 9add76f15cb0..fd4b6d2e436c 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -101,17 +101,6 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = {
 
 #define ACPI_INVALID_GSI                INT_MIN
 
-static int map_gsi_to_irq(unsigned int gsi, unsigned int flags)
-{
-        int i;
-
-        for (i = 0; i < nr_legacy_irqs(); i++)
-                if (isa_irq_to_gsi[i] == gsi)
-                        return i;
-
-        return mp_map_gsi_to_irq(gsi, flags);
-}
-
 /*
  * This is just a simple wrapper around early_ioremap(),
  * with sanity checks for phys == 0 and size == 0.
@@ -422,7 +411,7 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
                 return -1;
         }
 
-        irq = map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC);
+        irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC);
         if (irq < 0)
                 return irq;
 
@@ -603,7 +592,7 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
 
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
 {
-        int irq = map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
+        int irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
 
         if (irq >= 0) {
                 *irqp = irq;