7 files changed, 5 insertions, 27 deletions

diff --git a/arch/mips/include/asm/octeon/octeon-feature.h b/arch/mips/include/asm/octeon/octeon-feature.h
index ef24a7b4ea57..cba6fbed9f43 100644
--- a/arch/mips/include/asm/octeon/octeon-feature.h
+++ b/arch/mips/include/asm/octeon/octeon-feature.h
@@ -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));
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 323395081b2a..1773544e3dbb 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -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";
diff --git a/arch/mips/math-emu/ieee754dp.c b/arch/mips/math-emu/ieee754dp.c
index 6d2d89f32472..2f22fd7fd784 100644
--- a/arch/mips/math-emu/ieee754dp.c
+++ b/arch/mips/math-emu/ieee754dp.c
@@ -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 */
diff --git a/arch/mips/math-emu/ieee754sp.c b/arch/mips/math-emu/ieee754sp.c
index 463534045ab6..a19b72185ab9 100644
--- a/arch/mips/math-emu/ieee754sp.c
+++ b/arch/mips/math-emu/ieee754sp.c
@@ -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 */
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index 9cb0c807f564..d248b707eff3 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -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 "";
         }
diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c
index 6a882194e063..217424231eb6 100644
--- a/arch/mips/powertv/asic/asic_devices.c
+++ b/arch/mips/powertv/asic/asic_devices.c
@@ -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);
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c
index 5c2bf111ca67..d8b65204d288 100644
--- a/arch/mips/sgi-ip32/ip32-irq.c
+++ b/arch/mips/sgi-ip32/ip32-irq.c
@@ -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");