MIPS: mm: Remove dead macro definitions (8fc5ec70) · Commits · 戴 / test

In commit ("MIPS: mm: Only build one microassembler that is suitable"), the Makefile at arch/mips/mm was rewritten to only build the "right" microassembler file, depending on whether CONFIG_CPU_MICROMIPS is set or not. In the files, however, there are still preprocessor definitions depending on CONFIG_CPU_MICROMIPS. The #ifdef around them can now never evaluate to true, so let's remove them altogether. This inconsistency was found using the undertaker-checkpatch tool. Signed-off-by:

Andreas Ruprecht <rupran@einserver.de> Reviewed-by:

Maciej W. Rozycki <macro@linux-mips.org> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Cc: Valentin Rothberg <valentinrothberg@gmail.com> Cc: Paul Bolle <pebolle@tiscali.nl> Patchwork: https://patchwork.linux-mips.org/patch/9267/ Signed-off-by:

Ralf Baechle <ralf@linux-mips.org>

arch/mips/mm/uasm-micromips.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -38,14 +38,6 @@
		\| (e) << RE_SH \
		\| (f) << FUNC_SH)

		/* Define these when we are not the ISA the kernel is being compiled with. */
		#ifndef CONFIG_CPU_MICROMIPS
		#define MM_uasm_i_b(buf, off) ISAOPC(_beq)(buf, 0, 0, off)
		#define MM_uasm_i_beqz(buf, rs, off) ISAOPC(_beq)(buf, rs, 0, off)
		#define MM_uasm_i_beqzl(buf, rs, off) ISAOPC(_beql)(buf, rs, 0, off)
		#define MM_uasm_i_bnez(buf, rs, off) ISAOPC(_bne)(buf, rs, 0, off)
		#endif

		#include "uasm.c"

		static struct insn insn_table_MM[] = {

arch/mips/mm/uasm-mips.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -46,14 +46,6 @@
		\| (d) << SIMM9_SH \
		\| (e) << FUNC_SH)

		/* Define these when we are not the ISA the kernel is being compiled with. */
		#ifdef CONFIG_CPU_MICROMIPS
		#define CL_uasm_i_b(buf, off) ISAOPC(_beq)(buf, 0, 0, off)
		#define CL_uasm_i_beqz(buf, rs, off) ISAOPC(_beq)(buf, rs, 0, off)
		#define CL_uasm_i_beqzl(buf, rs, off) ISAOPC(_beql)(buf, rs, 0, off)
		#define CL_uasm_i_bnez(buf, rs, off) ISAOPC(_bne)(buf, rs, 0, off)
		#endif

		#include "uasm.c"

		static struct insn insn_table[] = {

Admin message