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>

arch/mips/kernel/traps.c

@@ -1033,8 +1033,8 @@ 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)) {
+	    likely(user_mode(regs)) &&
+	    likely(get_user(opcode, epc) >= 0)) {
 		status = mipsr2_decoder(regs, opcode);
 		switch (status) {
 		case 0:
@@ -1050,7 +1050,6 @@ asmlinkage void do_ri(struct pt_regs *regs)
 			return;
 		}
 	}
-	}
 
 no_r2_instr: