Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fe06260 authored by Roel Kluin's avatar Roel Kluin Committed by Ralf Baechle
Browse files

MIPS: Cleanup switches with cases that can be merged 



Signed-off-by: default avatarRoel 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1b362e3e

arch/mips/include/asm/octeon/octeon-feature.h

+2 −6
Original line number Diff line number Diff line
@@ -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));

arch/mips/kernel/cpu-probe.c

+0 −3
Original line number Diff line number Diff line
@@ -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";

arch/mips/math-emu/ieee754dp.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

arch/mips/math-emu/ieee754sp.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

arch/mips/pci/pci-octeon.c

+2 −4
Original line number Diff line number Diff line
@@ -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 "";

	}