|
 |
3d7c23 |
From cf1eeb29f94b68e4ed8b82818aed297012d1b2dd Mon Sep 17 00:00:00 2001
|
|
|
3d7c23 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Date: Thu, 1 Aug 2019 15:55:03 -0400
|
|
|
3d7c23 |
Subject: [PATCH 043/124] [scsi] scsi: qla2xxx: Simplify conditional check
|
|
|
3d7c23 |
again
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Message-id: <20190801155618.12650-44-hmadhani@redhat.com>
|
|
|
3d7c23 |
Patchwork-id: 267819
|
|
|
3d7c23 |
O-Subject: [RHEL 7.8 e-stor PATCH 043/118] scsi: qla2xxx: Simplify conditional check again
|
|
|
3d7c23 |
Bugzilla: 1729270
|
|
|
3d7c23 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3d7c23 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
From: Nathan Chancellor <natechancellor@gmail.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Bugzilla 1729270
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Clang warns when it sees a logical not on the left side of a conditional
|
|
|
3d7c23 |
statement because it thinks the logical not should be applied to the whole
|
|
|
3d7c23 |
statement, not just the left side:
|
|
|
3d7c23 |
|
|
|
3d7c23 |
drivers/scsi/qla2xxx/qla_nx.c:3703:7: warning: logical not is only
|
|
|
3d7c23 |
applied to the left hand side of this comparison
|
|
|
3d7c23 |
[-Wlogical-not-parentheses]
|
|
|
3d7c23 |
|
|
|
3d7c23 |
This particular instance was already fixed by commit 0bfe7d3cae58 ("scsi:
|
|
|
3d7c23 |
qla2xxx: Simplify conditional check") upstream but it was reintroduced by
|
|
|
3d7c23 |
commit 3695310e37b4 ("scsi: qla2xxx: Update flash read/write routine") in
|
|
|
3d7c23 |
the 5.2/scsi-queue.
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Fixes: 3695310e37b4 ("scsi: qla2xxx: Update flash read/write routine")
|
|
|
3d7c23 |
Link: https://github.com/ClangBuiltLinux/linux/issues/80
|
|
|
3d7c23 |
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
|
|
|
3d7c23 |
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
|
|
|
3d7c23 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3d7c23 |
(cherry picked from commit 46333cebe77883ff38be59c3e7200c5a5145d6ee)
|
|
|
3d7c23 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3d7c23 |
---
|
|
|
3d7c23 |
drivers/scsi/qla2xxx/qla_nx.c | 4 ++--
|
|
|
3d7c23 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
3d7c23 |
|
|
|
3d7c23 |
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
|
|
|
3d7c23 |
index 687c4cb49ecb..5b407708c105 100644
|
|
|
3d7c23 |
--- a/drivers/scsi/qla2xxx/qla_nx.c
|
|
|
3d7c23 |
+++ b/drivers/scsi/qla2xxx/qla_nx.c
|
|
|
3d7c23 |
@@ -3695,8 +3695,8 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
|
|
|
3d7c23 |
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
|
|
3d7c23 |
|
|
|
3d7c23 |
/* Wait for pending cmds (physical and virtual) to complete */
|
|
|
3d7c23 |
- if (!qla2x00_eh_wait_for_pending_commands(vha, 0, 0,
|
|
|
3d7c23 |
- WAIT_HOST) == QLA_SUCCESS) {
|
|
|
3d7c23 |
+ if (qla2x00_eh_wait_for_pending_commands(vha, 0, 0,
|
|
|
3d7c23 |
+ WAIT_HOST)) {
|
|
|
3d7c23 |
ql_dbg(ql_dbg_init, vha, 0x00b3,
|
|
|
3d7c23 |
"Done wait for "
|
|
|
3d7c23 |
"pending commands.\n");
|
|
|
3d7c23 |
--
|
|
|
3d7c23 |
2.13.6
|
|
|
3d7c23 |
|