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>

1 files changed, 15 insertions, 16 deletions

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 2444c6f9fc03..2594e4b7c0c3 100644
--- 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;
                 }
         }