From: Ralf Baechle Date: Tue, 3 Jun 2014 11:05:55 +0000 (+0200) Subject: MIPS: BFP: Simplify code slightly. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b4f16c938eed87aac733972e735c5bea700948aa;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git MIPS: BFP: Simplify code slightly. This keeps the if condition slightly simpler - it's going to become ore complication. Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c index 98e9d2395598..a67b9753330b 100644 --- a/arch/mips/net/bpf_jit.c +++ b/arch/mips/net/bpf_jit.c @@ -1240,7 +1240,10 @@ jmp_cmp: emit_half_load(r_A, r_skb, off, ctx); #ifdef CONFIG_CPU_LITTLE_ENDIAN /* This needs little endian fixup */ - if (!cpu_has_mips_r2) { + if (cpu_has_mips_r2) { + /* R2 and later have the wsbh instruction */ + emit_wsbh(r_A, r_A, ctx); + } else { /* Get first byte */ emit_andi(r_tmp_imm, r_A, 0xff, ctx); /* Shift it */ @@ -1250,9 +1253,6 @@ jmp_cmp: emit_andi(r_tmp_imm, r_tmp_imm, 0xff, ctx); /* Put everyting together in r_A */ emit_or(r_A, r_tmp, r_tmp_imm, ctx); - } else { - /* R2 and later have the wsbh instruction */ - emit_wsbh(r_A, r_A, ctx); } #endif break;