From: Max Filippov <jcmvbkbc@gmail.com>
Date: Wed, 2 Jan 2019 10:19:30 +0000 (-0800)
Subject: xtensa: simplify trap_init
X-Git-Tag: v5.1-rc1~127^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60deebe6149a3f02fa6a9fa988dda500effda43f;p=thirdparty%2Flinux.git

xtensa: simplify trap_init

Drop redundant 'fast &&' condition from the exception handler assignment
loop.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---

diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index e6fa55aa1ccb2..454d53096bc99 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -420,16 +420,15 @@ void __init trap_init(void)
 	/* Setup specific handlers. */
 
 	for(i = 0; dispatch_init_table[i].cause >= 0; i++) {
-
 		int fast = dispatch_init_table[i].fast;
 		int cause = dispatch_init_table[i].cause;
 		void *handler = dispatch_init_table[i].handler;
 
 		if (fast == 0)
 			set_handler(default_handler, cause, handler);
-		if (fast && fast & USER)
+		if ((fast & USER) != 0)
 			set_handler(fast_user_handler, cause, handler);
-		if (fast && fast & KRNL)
+		if ((fast & KRNL) != 0)
 			set_handler(fast_kernel_handler, cause, handler);
 	}