[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>

2 files changed, 1 insertions, 15 deletions

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();