[PATCH] ES7000 platform update (i386)

This is subarch update for ES7000.  I've modified platform check code and
removed unnecessary OEM table parsing for newer systems that don't use OEM
information during boot.  Parsing the table in fact is causing problems,
and the platform doesn't get recognized.  The patch only affects the ES7000
subach.

Signed-off-by: <Natalie.Protasevich@unisys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 22 insertions, 23 deletions

diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/i386/mach-es7000/es7000plat.c
index d5936d500479..2000bdca2fc2 100644
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
@@ -75,12 +75,29 @@ es7000_rename_gsi(int ioapic, int gsi)
 
 #endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT)
 
+void __init
+setup_unisys ()
+{
+        /*
+         * Determine the generation of the ES7000 currently running.
+         *
+         * es7000_plat = 1 if the machine is a 5xx ES7000 box
+         * es7000_plat = 2 if the machine is a x86_64 ES7000 box
+         *
+         */
+        if (!(boot_cpu_data.x86 <= 15 && boot_cpu_data.x86_model <= 2))
+                es7000_plat = 2;
+        else
+                es7000_plat = 1;
+        ioapic_renumber_irq = es7000_rename_gsi;
+}
+
 /*
  * Parse the OEM Table
  */
 
 int __init
-parse_unisys_oem (char *oemptr, int oem_entries)
+parse_unisys_oem (char *oemptr)
 {
         int                     i;
         int                     success = 0;
@@ -95,7 +112,7 @@ parse_unisys_oem (char *oemptr, int oem_entries)
 
         tp += 8;
 
-        for (i=0; i <= oem_entries; i++) {
+        for (i=0; i <= 6; i++) {
                 type = *tp++;
                 size = *tp++;
                 tp -= 2;
@@ -130,34 +147,18 @@ parse_unisys_oem (char *oemptr, int oem_entries)
                 default:
                         break;
                 }
-                if (i == 6) break;
                 tp += size;
         }
 
         if (success < 2) {
                 es7000_plat = 0;
-        } else {
-                printk("\nEnabling ES7000 specific features...\n");
-                /*
-                 * Determine the generation of the ES7000 currently running.
-                 *
-                 * es7000_plat = 0 if the machine is NOT a Unisys ES7000 box
-                 * es7000_plat = 1 if the machine is a 5xx ES7000 box
-                 * es7000_plat = 2 if the machine is a x86_64 ES7000 box
-                 *
-                 */
-                if (!(boot_cpu_data.x86 <= 15 && boot_cpu_data.x86_model <= 2))
-                        es7000_plat = 2;
-                else
-                        es7000_plat = 1;
-
-                ioapic_renumber_irq = es7000_rename_gsi;
-        }
+        } else
+                setup_unisys();
         return es7000_plat;
 }
 
 int __init
-find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length)
+find_unisys_acpi_oem_table(unsigned long *oem_addr)
 {
         struct acpi_table_rsdp          *rsdp = NULL;
         unsigned long                   rsdp_phys = 0;
@@ -201,13 +202,11 @@ find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length)
                                 acpi_table_print(header, sdt.entry[i].pa);
                                 t = (struct oem_table *) __acpi_map_table(sdt.entry[i].pa, header->length);
                                 addr = (void *) __acpi_map_table(t->OEMTableAddr, t->OEMTableSize);
-                                *length = header->length;
                                 *oem_addr = (unsigned long) addr;
                                 return 0;
                         }
                 }
         }
-        Dprintk("ES7000: did not find Unisys ACPI OEM table!\n");
         return -1;
 }