[PATCH linux-next] s390:fix Coccinelle warnings

From: jing yangyang
Date: Thu Aug 19 2021 - 22:52:22 EST


WARNING !A || A && B is equivalent to !A || B

This issue was detected with the help of Coccinelle.

Reported-by: Zeal Robot <zealci@xxxxxxxxxx>
Signed-off-by: jing yangyang <jing.yangyang@xxxxxxxxxx>
---
arch/s390/include/asm/scsw.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/s390/include/asm/scsw.h b/arch/s390/include/asm/scsw.h
index a7c3ccf..754122d 100644
--- a/arch/s390/include/asm/scsw.h
+++ b/arch/s390/include/asm/scsw.h
@@ -691,9 +691,8 @@ 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.stctl & SCSW_STCTL_INTER_STATUS) ||
+ (scsw->tm.actl & SCSW_ACTL_SUSPENDED));
}

/**
--
1.8.3.1