[MIPS] ARC: Get rid of mips_machgroup

This has not been any serious user of this ill conceived thing since the
original invention in like '95.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

27 files changed, 1 insertions, 57 deletions

diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index 0a3f025eb023..e6bdd07cc093 100644
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -59,8 +59,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
-
         /* Set the platform # */
 #if     defined (CONFIG_MIPS_DB1550)
         mips_machtype = MACH_DB1550;
diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c
index 88f2b6d97281..2aa7b2ed6a8c 100644
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -56,7 +56,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_MTX1;      /* set the platform # */
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c
index e9fa1bab81f3..4535f7208e18 100644
--- a/arch/mips/au1000/pb1000/init.c
+++ b/arch/mips/au1000/pb1000/init.c
@@ -54,7 +54,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1000;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c
index 6131b56f41b5..7ba6852de7cd 100644
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg3;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1100;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c
index 27f09e374e15..5a70029d5388 100644
--- a/arch/mips/au1000/pb1200/init.c
+++ b/arch/mips/au1000/pb1200/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1200;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c
index 733d2e469db2..e58a9d6c5021 100644
--- a/arch/mips/au1000/pb1500/init.c
+++ b/arch/mips/au1000/pb1500/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1500;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c
index 41daa3371be3..fad53bf5aad1 100644
--- a/arch/mips/au1000/pb1550/init.c
+++ b/arch/mips/au1000/pb1550/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1550;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c
index f1c76533b6fc..9f839c36f69e 100644
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -54,7 +54,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_XXS1500;   /* set the platform # */
 
         prom_init_cmdline();
diff --git a/arch/mips/basler/excite/excite_prom.c b/arch/mips/basler/excite/excite_prom.c
index 6ecd512b999d..2d752c2f6e59 100644
--- a/arch/mips/basler/excite/excite_prom.c
+++ b/arch/mips/basler/excite/excite_prom.c
@@ -136,7 +136,6 @@ void __init prom_init(void)
 #       error 64 bit support not implemented
 #endif /* CONFIG_64BIT */
 
-        mips_machgroup = MACH_GROUP_TITAN;
         mips_machtype = MACH_TITAN_EXCITE;
 }
 
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index fc9cbb251edc..5d2e8790b28b 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -114,8 +114,6 @@ void __init prom_init(void)
         unsigned long memsz;
         char **argv;
 
-        mips_machgroup = MACH_GROUP_COBALT;
-
         memsz = fw_arg0 & 0x7fff0000;
         narg = fw_arg0 & 0x0000ffff;
 
diff --git a/arch/mips/dec/prom/identify.c b/arch/mips/dec/prom/identify.c
index cd85924e2572..95e26f4bb38f 100644
--- a/arch/mips/dec/prom/identify.c
+++ b/arch/mips/dec/prom/identify.c
@@ -133,9 +133,6 @@ void __init prom_identify_arch(u32 magic)
         dec_firmrev = (dec_sysid & 0xff00) >> 8;
         dec_etc = dec_sysid & 0xff;
 
-        /* We're obviously one of the DEC machines */
-        mips_machgroup = MACH_GROUP_DEC;
-
         /*
          * FIXME: This may not be an exhaustive list of DECStations/Servers!
          * Put all model-specific initialisation calls here.
diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index 7433bd8e5562..0f791eb6bb66 100644
--- a/arch/mips/emma2rh/common/prom.c
+++ b/arch/mips/emma2rh/common/prom.c
@@ -62,8 +62,6 @@ void __init prom_init(void)
                 strcat(arcs_cmdline, " ");
         }
 
-        mips_machgroup = MACH_GROUP_NEC_EMMA2RH;
-
 #if defined(CONFIG_MARKEINS)
         mips_machtype = MACH_NEC_MARKEINS;
         add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
index 5d28dbe06f40..28dfd2e2989a 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 group;
         int type;
         int flags;
 };
@@ -31,49 +30,41 @@ static struct smatch mach_table[] = {
         {
                 .arcname        = "SGI-IP22",
                 .liname         = "SGI Indy",
-                .group          = MACH_GROUP_SGI,
                 .type           = MACH_SGI_IP22,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP27",
                 .liname         = "SGI Origin",
-                .group          = MACH_GROUP_SGI,
                 .type           = MACH_SGI_IP27,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP28",
                 .liname         = "SGI IP28",
-                .group          = MACH_GROUP_SGI,
                 .type           = MACH_SGI_IP28,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP30",
                 .liname         = "SGI Octane",
-                .group          = MACH_GROUP_SGI,
                 .type           = MACH_SGI_IP30,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP32",
                 .liname         = "SGI O2",
-                .group          = MACH_GROUP_SGI,
                 .type           = MACH_SGI_IP32,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "Microsoft-Jazz",
                 .liname         = "Jazz MIPS_Magnum_4000",
-                .group          = MACH_GROUP_JAZZ,
                 .type           = MACH_MIPS_MAGNUM_4000,
                 .flags          = 0,
         }, {
                 .arcname        = "PICA-61",
                 .liname         = "Jazz Acer_PICA_61",
-                .group          = MACH_GROUP_JAZZ,
                 .type           = MACH_ACER_PICA_61,
                 .flags          = 0,
         }, {
                 .arcname        = "RM200PCI",
                 .liname         = "SNI RM200_PCI",
-                .group          = MACH_GROUP_SNI_RM,
                 .type           = MACH_SNI_RM200_PCI,
                 .flags          = PROM_FLAG_DONT_FREE_TEMP,
         }
@@ -125,7 +116,6 @@ void __init prom_identify_arch(void)
         mach = string_to_mach(iname);
         system_type = mach->liname;
 
-        mips_machgroup = mach->group;
         mips_machtype = mach->type;
         prom_flags = mach->flags;
 }
diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c
index ed58c13b6032..238b5087fbb3 100644
--- a/arch/mips/gt64120/wrppmc/setup.c
+++ b/arch/mips/gt64120/wrppmc/setup.c
@@ -159,7 +159,6 @@ const char *get_system_type(void)
  */
 void __init prom_init(void)
 {
-        mips_machgroup = MACH_GROUP_WINDRIVER;
         mips_machtype = MACH_WRPPMC;
 
         add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, BOOT_MEM_RAM);
diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/jmr3927/rbhma3100/init.c
index 9169fab1773a..b643f75ec9a5 100644
--- a/arch/mips/jmr3927/rbhma3100/init.c
+++ b/arch/mips/jmr3927/rbhma3100/init.c
@@ -51,7 +51,6 @@ void __init prom_init(void)
         if ((tx3927_ccfgptr->ccfg & TX3927_CCFG_TLBOFF) == 0)
                 puts("Warning: TX3927 TLB off\n");
 #endif
-        mips_machgroup = MACH_GROUP_TOSHIBA;
 
 #ifdef CONFIG_TOSHIBA_JMR3927
         mips_machtype = MACH_TOSHIBA_JMR3927;
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 316685fca059..a06a27d6cfcd 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -51,10 +51,8 @@ EXPORT_SYMBOL(PCI_DMA_BUS_IS_PHYS);
  * These are initialized so they are in the .data section
  */
 unsigned long mips_machtype __read_mostly = MACH_UNKNOWN;
-unsigned long mips_machgroup __read_mostly = MACH_GROUP_UNKNOWN;
 
 EXPORT_SYMBOL(mips_machtype);
-EXPORT_SYMBOL(mips_machgroup);
 
 struct boot_mem_map boot_mem_map;
 
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c
index 4b80fffcf262..209edcc26f07 100644
--- a/arch/mips/lasat/prom.c
+++ b/arch/mips/lasat/prom.c
@@ -100,8 +100,6 @@ void __init prom_init(void)
 
         lasat_init_board_info();                /* Read info from EEPROM */
 
-        mips_machgroup = MACH_GROUP_LASAT;
-
         /* Get the command line */
         if (argc > 0) {
                 strncpy(arcs_cmdline, argv[0], CL_SIZE-1);
diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c
index 3efb1cf111f2..824336812198 100644
--- a/arch/mips/lemote/lm2e/prom.c
+++ b/arch/mips/lemote/lm2e/prom.c
@@ -57,7 +57,6 @@ void __init prom_init(void)
         arg = (int *)fw_arg1;
         env = (int *)fw_arg2;
 
-        mips_machgroup = MACH_GROUP_LEMOTE;
         mips_machtype = MACH_LEMOTE_FULONG;
 
         prom_init_cmdline();
diff --git a/arch/mips/philips/pnx8550/jbs/init.c b/arch/mips/philips/pnx8550/jbs/init.c
index 85f449174bc3..cfd90fa3d799 100644
--- a/arch/mips/philips/pnx8550/jbs/init.c
+++ b/arch/mips/philips/pnx8550/jbs/init.c
@@ -48,7 +48,6 @@ void __init prom_init(void)
 
         unsigned long memsize;
 
-        mips_machgroup = MACH_GROUP_PHILIPS;
         mips_machtype = MACH_PHILIPS_JBS;
 
         //memsize = 0x02800000; /* Trimedia uses memory above */
diff --git a/arch/mips/philips/pnx8550/stb810/prom_init.c b/arch/mips/philips/pnx8550/stb810/prom_init.c
index ea5b4e0fb47d..fdb33ed089b9 100644
--- a/arch/mips/philips/pnx8550/stb810/prom_init.c
+++ b/arch/mips/philips/pnx8550/stb810/prom_init.c
@@ -41,7 +41,6 @@ void __init prom_init(void)
 
         prom_init_cmdline();
 
-        mips_machgroup = MACH_GROUP_PHILIPS;
         mips_machtype = MACH_PHILIPS_STB810;
 
         memsize = 0x08000000; /* Trimedia uses memory above */
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
index 8f69b789be90..e4cc54824475 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -176,16 +176,13 @@ void __init prom_init(void)
         case FAMILY_FPGA:
                 if (FPGA_IS_MSP4200(revision)) {
                         /* Old-style revision ID */
-                        mips_machgroup = MACH_GROUP_MSP;
                         mips_machtype = MACH_MSP4200_FPGA;
                 } else {
-                        mips_machgroup = MACH_GROUP_MSP;
                         mips_machtype = MACH_MSP_OTHER;
                 }
                 break;
 
         case FAMILY_MSP4200:
-                mips_machgroup = MACH_GROUP_MSP;
 #if defined(CONFIG_PMC_MSP4200_EVAL)
                 mips_machtype  = MACH_MSP4200_EVAL;
 #elif defined(CONFIG_PMC_MSP4200_GW)
@@ -196,12 +193,10 @@ void __init prom_init(void)
                 break;
 
         case FAMILY_MSP4200_FPGA:
-                mips_machgroup = MACH_GROUP_MSP;
                 mips_machtype  = MACH_MSP4200_FPGA;
                 break;
 
         case FAMILY_MSP7100:
-                mips_machgroup = MACH_GROUP_MSP;
 #if defined(CONFIG_PMC_MSP7120_EVAL)
                 mips_machtype = MACH_MSP7120_EVAL;
 #elif defined(CONFIG_PMC_MSP7120_GW)
@@ -212,22 +207,14 @@ void __init prom_init(void)
                 break;
 
         case FAMILY_MSP7100_FPGA:
-                mips_machgroup = MACH_GROUP_MSP;
                 mips_machtype  = MACH_MSP7120_FPGA;
                 break;
 
         default:
                 /* we don't recognize the machine */
-                mips_machgroup = MACH_GROUP_UNKNOWN;
                 mips_machtype  = MACH_UNKNOWN;
-                break;
-        }
-
-        /* make sure we have the right initialization routine - sanity */
-        if (mips_machgroup != MACH_GROUP_MSP) {
-                ppfinit("Unknown machine group in a "
-                        "MSP initialization routine\n");
                 panic("***Bogosity factor five***, exiting\n");
+                break;
         }
 
         prom_init_cmdline();
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index 0cd78f0f5f2d..9b9936de6589 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -126,7 +126,6 @@ void __init prom_init(void)
                 env++;
         }
 
-        mips_machgroup = MACH_GROUP_TITAN;
         mips_machtype = MACH_TITAN_YOSEMITE;
 
         prom_grab_secondary();
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index d842b98efb67..147b7fb02e64 100644
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -339,7 +339,6 @@ void __init prom_init(void)
         /* Not sure this is needed, but it's the safe way. */
         arcs_cmdline[CL_SIZE-1] = 0;
 
-        mips_machgroup = MACH_GROUP_SIBYTE;
         prom_meminit();
 }
 
diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c
index 257c4e674353..f07ad3baccab 100644
--- a/arch/mips/sibyte/sb1250/prom.c
+++ b/arch/mips/sibyte/sb1250/prom.c
@@ -83,7 +83,6 @@ void __init prom_init(void)
 
         strcpy(arcs_cmdline, "root=/dev/ram0 ");
 
-        mips_machgroup = MACH_GROUP_SIBYTE;
         prom_meminit();
 }
 
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
index 9a3a5babd1fb..f3f86857beae 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
@@ -66,8 +66,6 @@ void __init prom_init(void)
 
         prom_init_cmdline();
 
-        mips_machgroup = MACH_GROUP_TOSHIBA;
-
         if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) {
                 mips_machtype = MACH_TOSHIBA_RBTX4927;
                 toshiba_name  = "TX4927";
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
index 7dc6a0aae21c..69f21c1b7942 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
@@ -47,7 +47,6 @@ void __init prom_init(void)
 #ifndef CONFIG_TX4938_NAND_BOOT
         prom_init_cmdline();
 #endif
-        mips_machgroup = MACH_GROUP_TOSHIBA;
         mips_machtype = MACH_TOSHIBA_RBTX4938;
 
         msize = tx4938_get_mem_size();
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
index b20b93b2b95e..58e47686b499 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
@@ -64,7 +64,6 @@ static void __init nec_cmbvr4133_setup(void)
 #endif
         set_io_port_base(KSEG1ADDR(0x16000000));
 
-        mips_machgroup = MACH_GROUP_NEC_VR41XX;
         mips_machtype = MACH_NEC_CMBVR4133;
 
 #ifdef CONFIG_PCI