MIPS: Cleanup switches with cases that can be merged
authorRoel Kluin <roel.kluin@gmail.com>
Tue, 19 Jan 2010 23:59:27 +0000 (00:59 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 27 Feb 2010 11:53:14 +0000 (12:53 +0100)
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
To: linux-mips@linux-mips.org
To: Andrew Morton <akpm@linux-foundation.org>
To: LKML <linux-kernel@vger.kernel.org>
Patchwork: http://patchwork.linux-mips.org/patch/860/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/include/asm/octeon/octeon-feature.h
arch/mips/kernel/cpu-probe.c
arch/mips/math-emu/ieee754dp.c
arch/mips/math-emu/ieee754sp.c
arch/mips/pci/pci-octeon.c
arch/mips/powertv/asic/asic_devices.c
arch/mips/sgi-ip32/ip32-irq.c

index ef24a7b4ea57858332da5ac11acaf43e59fbb50c..cba6fbed9f438249fde6cd3f346577a77fa7c3e2 100644 (file)
@@ -99,6 +99,8 @@ static inline int octeon_has_feature(enum octeon_feature feature)
                return !cvmx_fuse_read(90);
 
        case OCTEON_FEATURE_PCIE:
+       case OCTEON_FEATURE_MGMT_PORT:
+       case OCTEON_FEATURE_RAID:
                return OCTEON_IS_MODEL(OCTEON_CN56XX)
                        || OCTEON_IS_MODEL(OCTEON_CN52XX);
 
@@ -110,12 +112,6 @@ static inline int octeon_has_feature(enum octeon_feature feature)
        case OCTEON_FEATURE_TRA:
                return !(OCTEON_IS_MODEL(OCTEON_CN30XX)
                         || OCTEON_IS_MODEL(OCTEON_CN50XX));
-       case OCTEON_FEATURE_MGMT_PORT:
-               return OCTEON_IS_MODEL(OCTEON_CN56XX)
-                       || OCTEON_IS_MODEL(OCTEON_CN52XX);
-       case OCTEON_FEATURE_RAID:
-               return OCTEON_IS_MODEL(OCTEON_CN56XX)
-                       || OCTEON_IS_MODEL(OCTEON_CN52XX);
        case OCTEON_FEATURE_USB:
                return !(OCTEON_IS_MODEL(OCTEON_CN38XX)
                         || OCTEON_IS_MODEL(OCTEON_CN58XX));
index 323395081b2a0fc13aa7af745641fe96d6558d6c..1773544e3dbbafeef03018122e7b9a5ac20fffcf 100644 (file)
@@ -746,9 +746,6 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)
                __cpu_name[cpu] = "MIPS 4Kc";
                break;
        case PRID_IMP_4KEC:
-               c->cputype = CPU_4KEC;
-               __cpu_name[cpu] = "MIPS 4KEc";
-               break;
        case PRID_IMP_4KECR2:
                c->cputype = CPU_4KEC;
                __cpu_name[cpu] = "MIPS 4KEc";
index 6d2d89f324721115a6577d8726f1f38404d08c9d..2f22fd7fd78445c356d4775c5d18acd14353d322 100644 (file)
@@ -148,7 +148,6 @@ ieee754dp ieee754dp_format(int sn, int xe, u64 xm)
 
                        switch(ieee754_csr.rm) {
                        case IEEE754_RN:
-                               return ieee754dp_zero(sn);
                        case IEEE754_RZ:
                                return ieee754dp_zero(sn);
                        case IEEE754_RU:    /* toward +Infinity */
index 463534045ab60ac68243b1bf5a2b104b77ccad83..a19b72185ab94c4700c069cbba72ba1e4461ab13 100644 (file)
@@ -149,7 +149,6 @@ ieee754sp ieee754sp_format(int sn, int xe, unsigned xm)
 
                        switch(ieee754_csr.rm) {
                        case IEEE754_RN:
-                               return ieee754sp_zero(sn);
                        case IEEE754_RZ:
                                return ieee754sp_zero(sn);
                        case IEEE754_RU:      /* toward +Infinity */
index 9cb0c807f564bdc00ac7e0f3f4e6ee43d4c1d730..d248b707eff3c02c00f2b62eca1b8fa0d88782a4 100644 (file)
@@ -209,16 +209,14 @@ const char *octeon_get_pci_interrupts(void)
        case CVMX_BOARD_TYPE_NAO38:
                /* This is really the NAC38 */
                return "AAAAADABAAAAAAAAAAAAAAAAAAAAAAAA";
-       case CVMX_BOARD_TYPE_THUNDER:
-               return "";
-       case CVMX_BOARD_TYPE_EBH3000:
-               return "";
        case CVMX_BOARD_TYPE_EBH3100:
        case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
        case CVMX_BOARD_TYPE_CN3005_EVB_HS5:
                return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
        case CVMX_BOARD_TYPE_BBGW_REF:
                return "AABCD";
+       case CVMX_BOARD_TYPE_THUNDER:
+       case CVMX_BOARD_TYPE_EBH3000:
        default:
                return "";
        }
index 6a882194e063251fe80a3da2e8969e3d60473a0a..217424231eb6f8ebcb1bcdc25735b848f76a25e6 100644 (file)
@@ -340,10 +340,6 @@ static void __init platform_configure_usb(void)
 
        switch (asic) {
        case ASIC_ZEUS:
-               fs_update(0x0000, 0x11, 0x02, 0);
-               bcm1_usb2_ctl = 0x803;
-               break;
-
        case ASIC_CRONUS:
        case ASIC_CRONUSLITE:
                fs_update(0x0000, 0x11, 0x02, 0);
index 5c2bf111ca67ecf7a36230bccd2b19701f36f367..d8b65204d28868561d9cff524bc8853fad824f0a 100644 (file)
@@ -512,10 +512,6 @@ void __init arch_init_irq(void)
                                "level");
                        break;
 
-               case CRIME_GBE0_IRQ ... CRIME_GBE3_IRQ:
-                       set_irq_chip_and_handler_name(irq,
-                               &crime_edge_interrupt, handle_edge_irq, "edge");
-                       break;
                case CRIME_CPUERR_IRQ:
                case CRIME_MEMERR_IRQ:
                        set_irq_chip_and_handler_name(irq,
@@ -523,12 +519,9 @@ void __init arch_init_irq(void)
                                "level");
                        break;
 
+               case CRIME_GBE0_IRQ ... CRIME_GBE3_IRQ:
                case CRIME_RE_EMPTY_E_IRQ ... CRIME_RE_IDLE_E_IRQ:
                case CRIME_SOFT0_IRQ ... CRIME_SOFT2_IRQ:
-                       set_irq_chip_and_handler_name(irq,
-                               &crime_edge_interrupt, handle_edge_irq, "edge");
-                       break;
-
                case CRIME_VICE_IRQ:
                        set_irq_chip_and_handler_name(irq,
                                &crime_edge_interrupt, handle_edge_irq, "edge");