s390: Simplify the calculation of variables

Fix the following coccicheck warnings:

./arch/s390/include/asm/scsw.h:528:48-50: WARNING !A || A && B is
equivalent to !A || B.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Zhong <abaci-bugfix@linux.alibaba.com>
Reviewed-by: Vineeth Vijayan <vneethv@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

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