1 files changed, 16 insertions, 34 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 09682766d56a..392360c607dc 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -483,11 +483,6 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger,
         if (acpi_sci_flags & ACPI_MADT_POLARITY_MASK)
                 polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;
 
-        /*
-         * mp_config_acpi_legacy_irqs() already setup IRQs < 16
-         * If GSI is < 16, this will update its flags,
-         * else it will create a new mp_irqs[] entry.
-         */
         mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);
 
         /*
@@ -686,14 +681,7 @@ void acpi_unregister_gsi(u32 gsi)
 }
 EXPORT_SYMBOL_GPL(acpi_unregister_gsi);
 
-void __init acpi_set_irq_model_pic(void)
-{
-        acpi_irq_model = ACPI_IRQ_MODEL_PIC;
-        __acpi_register_gsi = acpi_register_gsi_pic;
-        acpi_ioapic = 0;
-}
-
-void __init acpi_set_irq_model_ioapic(void)
+static void __init acpi_set_irq_model_ioapic(void)
 {
         acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC;
         __acpi_register_gsi = acpi_register_gsi_ioapic;
@@ -932,9 +920,8 @@ static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
          * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
          */
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
-                                  acpi_parse_lapic_addr_ovr, 0);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
+                                      acpi_parse_lapic_addr_ovr, 0);
         if (count < 0) {
                 printk(KERN_ERR PREFIX
                        "Error parsing LAPIC address override entry\n");
@@ -959,9 +946,8 @@ static int __init acpi_parse_madt_lapic_entries(void)
          * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
          */
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
-                                  acpi_parse_lapic_addr_ovr, 0);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
+                                      acpi_parse_lapic_addr_ovr, 0);
         if (count < 0) {
                 printk(KERN_ERR PREFIX
                        "Error parsing LAPIC address override entry\n");
@@ -989,11 +975,10 @@ static int __init acpi_parse_madt_lapic_entries(void)
                 return count;
         }
 
-        x2count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC_NMI,
-                                  acpi_parse_x2apic_nmi, 0);
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI, acpi_parse_lapic_nmi, 0);
+        x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC_NMI,
+                                        acpi_parse_x2apic_nmi, 0);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI,
+                                      acpi_parse_lapic_nmi, 0);
         if (count < 0 || x2count < 0) {
                 printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
                 /* TBD: Cleanup to allow fallback to MPS */
@@ -1022,7 +1007,7 @@ static void __init mp_config_acpi_legacy_irqs(void)
          * Use the default configuration for the IRQs 0-15.  Unless
          * overridden by (MADT) interrupt source override entries.
          */
-        for (i = 0; i < 16; i++) {
+        for (i = 0; i < NR_IRQS_LEGACY; i++) {
                 int ioapic, pin;
                 unsigned int dstapic;
                 int idx;
@@ -1099,9 +1084,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
                 return -ENODEV;
         }
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_IO_APIC, acpi_parse_ioapic,
-                                  MAX_IO_APICS);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_IO_APIC, acpi_parse_ioapic,
+                                      MAX_IO_APICS);
         if (!count) {
                 printk(KERN_ERR PREFIX "No IOAPIC entries present\n");
                 return -ENODEV;
@@ -1110,9 +1094,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
                 return count;
         }
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr,
-                                  nr_irqs);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE,
+                                      acpi_parse_int_src_ovr, nr_irqs);
         if (count < 0) {
                 printk(KERN_ERR PREFIX
                        "Error parsing interrupt source overrides entry\n");
@@ -1131,9 +1114,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
         /* Fill in identity legacy mappings where no override */
         mp_config_acpi_legacy_irqs();
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE, acpi_parse_nmi_src,
-                                  nr_irqs);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE,
+                                      acpi_parse_nmi_src, nr_irqs);
         if (count < 0) {
                 printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
                 /* TBD: Cleanup to allow fallback to MPS */