MIPS: Reindent R6 RI exception emulation

Fold a nested `if' statement for the R6 case in `do_ri' into its
containing `if' block, removing excessive indentation causing code to
extend beyond 79 columns.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9679/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 2444c6f9fc031a40a6289d224b2ab1139fbba043..2594e4b7c0c37853db965134c7d6fb337029b326 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1033,22 +1033,21 @@ asmlinkage void do_ri(struct pt_regs *regs)
         * as quickly as possible.
         */
        if (mipsr2_emulation && cpu_has_mips_r6 &&
-           likely(user_mode(regs))) {
-               if (likely(get_user(opcode, epc) >= 0)) {
-                       status = mipsr2_decoder(regs, opcode);
-                       switch (status) {
-                       case 0:
-                       case SIGEMT:
-                               task_thread_info(current)->r2_emul_return = 1;
-                               return;
-                       case SIGILL:
-                               goto no_r2_instr;
-                       default:
-                               process_fpemu_return(status,
-                                                    &current->thread.cp0_baduaddr);
-                               task_thread_info(current)->r2_emul_return = 1;
-                               return;
-                       }
+           likely(user_mode(regs)) &&
+           likely(get_user(opcode, epc) >= 0)) {
+               status = mipsr2_decoder(regs, opcode);
+               switch (status) {
+               case 0:
+               case SIGEMT:
+                       task_thread_info(current)->r2_emul_return = 1;
+                       return;
+               case SIGILL:
+                       goto no_r2_instr;
+               default:
+                       process_fpemu_return(status,
+                                            &current->thread.cp0_baduaddr);
+                       task_thread_info(current)->r2_emul_return = 1;
+                       return;
                }
        }