sparc32: Remove sun4 and sun4c from enum sparc_cpu.

All the remaining references are trivially removed since we've
just eliminated the final reference to sparc_cpu_model from
assembler code in commit b7d96ce189564e661909fbf8df39d7358149885b
("sparc32: Remove sparc_cpu_model read from floppy interrupt handler.")

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 10 deletions

diff --git a/arch/sparc/kernel/auxio_32.c b/arch/sparc/kernel/auxio_32.c
index 56d0f52c3e62..e20cc55fb768 100644
--- a/arch/sparc/kernel/auxio_32.c
+++ b/arch/sparc/kernel/auxio_32.c
@@ -32,7 +32,6 @@ void __init auxio_probe(void)
         switch (sparc_cpu_model) {
         case sparc_leon:
         case sun4d:
-        case sun4:
                 return;
         default:
                 break;
@@ -65,9 +64,8 @@ void __init auxio_probe(void)
         r.start = auxregs[0].phys_addr;
         r.end = auxregs[0].phys_addr + auxregs[0].reg_size - 1;
         auxio_register = of_ioremap(&r, 0, auxregs[0].reg_size, "auxio");
-        /* Fix the address on sun4m and sun4c. */
-        if((((unsigned long) auxregs[0].phys_addr) & 3) == 3 ||
-           sparc_cpu_model == sun4c)
+        /* Fix the address on sun4m. */
+        if ((((unsigned long) auxregs[0].phys_addr) & 3) == 3)
                 auxio_register += (3 - ((unsigned long)auxio_register & 3));
 
         set_auxio(AUXIO_LED, 0);
@@ -86,12 +84,7 @@ void set_auxio(unsigned char bits_on, unsigned char bits_off)
         unsigned char regval;
         unsigned long flags;
         spin_lock_irqsave(&auxio_lock, flags);
-        switch(sparc_cpu_model) {
-        case sun4c:
-                regval = sbus_readb(auxio_register);
-                sbus_writeb(((regval | bits_on) & ~bits_off) | AUXIO_ORMEIN,
-                        auxio_register);
-                break;
+        switch (sparc_cpu_model) {
         case sun4m:
                 if(!auxio_register)
                         break;     /* VME chassis sun4m, no auxio. */