powerpc/eeh: Cleanup eeh_enabled()

Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index b48b08ed9be373884bd767bba041a6d30cb5adf9..247f09ce44de410f4d2c1e39af9fc87dd03fa6e3 100644 (file)
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -241,11 +241,7 @@ static inline bool eeh_has_flag(int flag)
 
 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)