瀏覽代碼

powerpc/eeh: Cleanup eeh_enabled()

Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Sam Bobroff 7 年之前
父節點
當前提交
54644927a0
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      arch/powerpc/include/asm/eeh.h

+ 1 - 5
arch/powerpc/include/asm/eeh.h

@@ -241,11 +241,7 @@ static inline bool eeh_has_flag(int flag)
 
 
 static inline bool eeh_enabled(void)
 static inline bool eeh_enabled(void)
 {
 {
-	if (eeh_has_flag(EEH_FORCE_DISABLED) ||
-	    !eeh_has_flag(EEH_ENABLED))
-		return false;
-
-	return true;
+	return eeh_has_flag(EEH_ENABLED) && !eeh_has_flag(EEH_FORCE_DISABLED);
 }
 }
 
 
 static inline void eeh_serialize_lock(unsigned long *flags)
 static inline void eeh_serialize_lock(unsigned long *flags)