[PATCH] s390: Simplify the calculation of variables

From: Jiapeng Chong
Date: Mon Mar 01 2021 - 05:34:02 EST


Fix the following coccicheck warnings:

./arch/s390/include/asm/scsw.h:695:47-49: WARNING !A || A && B is
equivalent to !A || B.

Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx>
Signed-off-by: Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx>
---
arch/s390/include/asm/scsw.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/s390/include/asm/scsw.h b/arch/s390/include/asm/scsw.h
index a7c3ccf..343b50f 100644
--- a/arch/s390/include/asm/scsw.h
+++ b/arch/s390/include/asm/scsw.h
@@ -692,8 +692,7 @@ static inline int scsw_tm_is_valid_pno(union scsw *scsw)
return (scsw->tm.fctl != 0) &&
(scsw->tm.stctl & SCSW_STCTL_STATUS_PEND) &&
(!(scsw->tm.stctl & SCSW_STCTL_INTER_STATUS) ||
- ((scsw->tm.stctl & SCSW_STCTL_INTER_STATUS) &&
- (scsw->tm.actl & SCSW_ACTL_SUSPENDED)));
+ (scsw->tm.actl & SCSW_ACTL_SUSPENDED));
}

/**
--
1.8.3.1