[MIPS] Remove mips_machtype from ARC based machines

This is the ARC part of the mips_machtype removal.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 1 insertions, 13 deletions

diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
index 23066985a734..0ce9acf10c39 100644
--- a/arch/mips/fw/arc/identify.c
+++ b/arch/mips/fw/arc/identify.c
@@ -22,7 +22,6 @@
 struct smatch {
         char *arcname;
         char *liname;
-        int type;
         int flags;
 };
 
@@ -30,47 +29,38 @@ static struct smatch mach_table[] = {
         {
                 .arcname        = "SGI-IP22",
                 .liname         = "SGI Indy",
-                .type           = MACH_SGI_IP22,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP27",
                 .liname         = "SGI Origin",
-                .type           = MACH_SGI_IP27,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP28",
                 .liname         = "SGI IP28",
-                .type           = MACH_SGI_IP28,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP30",
                 .liname         = "SGI Octane",
-                .type           = MACH_SGI_IP30,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP32",
                 .liname         = "SGI O2",
-                .type           = MACH_SGI_IP32,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "Microsoft-Jazz",
                 .liname         = "Jazz MIPS_Magnum_4000",
-                .type           = MACH_MIPS_MAGNUM_4000,
                 .flags          = 0,
         }, {
                 .arcname        = "PICA-61",
                 .liname         = "Jazz Acer_PICA_61",
-                .type           = MACH_ACER_PICA_61,
                 .flags          = 0,
         }, {
                 .arcname        = "RM200PCI",
                 .liname         = "SNI RM200_PCI",
-                .type           = MACH_SNI_RM200_PCI,
                 .flags          = PROM_FLAG_DONT_FREE_TEMP,
         }, {
                 .arcname        = "RM200PCI-R5K",
                 .liname         = "SNI RM200_PCI-R5K",
-                .type           = MACH_SNI_RM200_PCI,
                 .flags          = PROM_FLAG_DONT_FREE_TEMP,
         }
 };
@@ -121,6 +111,5 @@ void __init prom_identify_arch(void)
         mach = string_to_mach(iname);
         system_type = mach->liname;
 
-        mips_machtype = mach->type;
         prom_flags = mach->flags;
 }
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index f136c8a8591c..f60524e8bc44 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -76,8 +76,7 @@ void __init plat_mem_setup(void)
 
         set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA
-        if (mips_machtype == MACH_MIPS_MAGNUM_4000)
-                EISA_bus = 1;
+        EISA_bus = 1;
 #endif
 
         /* request I/O space for devices used on all i[345]86 PCs */