OSDN Git Service

scsi: qla4xxx: Simplify conditional
authorWan Jiabing <wanjiabing@vivo.com>
Wed, 14 Apr 2021 12:17:26 +0000 (20:17 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 10 May 2021 17:25:12 +0000 (13:25 -0400)
Fix the following coccicheck warning:

./drivers/scsi/qla4xxx/ql4_83xx.c:475:23-25: WARNING !A || A && B is
equivalent to !A || B

Link: https://lore.kernel.org/r/20210414121726.12503-1-wanjiabing@vivo.com
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla4xxx/ql4_83xx.c

index 5f56122..db41d90 100644 (file)
@@ -472,8 +472,7 @@ int qla4_83xx_can_perform_reset(struct scsi_qla_host *ha)
                } else if (device_map[i].device_type == ISCSI_CLASS) {
                        if (drv_active & (1 << device_map[i].func_num)) {
                                if (!iscsi_present ||
-                                   (iscsi_present &&
-                                    (iscsi_func_low > device_map[i].func_num)))
+                               iscsi_func_low > device_map[i].func_num)
                                        iscsi_func_low = device_map[i].func_num;
 
                                iscsi_present++;