Skip to contentSkip to conversation

scsi: elx: efct: Eliminate unnecessary boolean check in efct_hw_command_cancel()

PATCH Applied Nathan Chancellor 3 participants 3 messages Jun 17, 2021 – Jun 19, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: elx: efct: Eliminate unnecessary boolean check in efct_hw_command_cancel()

clang warns:

drivers/scsi/elx/efct/efct_hw.c:1523:17: warning: address of array 'ctx->buf' will always evaluate to 'true' [-Wpointer-bool-conversion]

                              (!ctx->buf ? U32_MAX : *((u32 *)ctx->buf)));
                               ~~~~~~^~~

buf is an array in the middle of a struct so deferencing it is not a problem as long as ctx is not NULL. Eliminate the check, which fixes the warning.

Fixes 580c0255e4ef ("scsi: elx: efct: RQ buffer, memory pool allocation and deallocation APIs")
---
 drivers/scsi/elx/efct/efct_hw.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/elx/efct/efct_hw.c +1 -2
index ce4736c41564..5b508d49e5a5 100644
@@ -1519,8 +1519,7 @@ efct_hw_command_cancel(struct efct_hw *hw)
 				       struct efct_command_ctx, list_entry);
 
 		efc_log_debug(hw->os, "hung command %08x\n",
-			      !ctx ? U32_MAX :
-			      (!ctx->buf ? U32_MAX : *((u32 *)ctx->buf)));
+			      !ctx ? U32_MAX : *((u32 *)ctx->buf));
 		spin_unlock_irqrestore(&hw->cmd_lock, flags);
 		rc = efct_hw_command_process(hw, -1, mqe, SLI4_BMBX_SIZE);
 		spin_lock_irqsave(&hw->cmd_lock, flags);

base-commit: ebc076b3eddc807729bd81f7bc48e798a3ddc477

Signature · 1 line
2.32.0.93.g670b81a890
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Nathan Chancellor

clang warns:

drivers/scsi/elx/efct/efct_hw.c:1523:17: warning: address of array 'ctx->buf' will always evaluate to 'true' [-Wpointer-bool-conversion]

                               (!ctx->buf ? U32_MAX : *((u32 *)ctx->buf)));
                                ~~~~~~^~~

buf is an array in the middle of a struct so deferencing it is not a problem as long as ctx is not NULL. Eliminate the check, which fixes the warning.

Quoted 6 lines
Fixes 580c0255e4ef ("scsi: elx: efct: RQ buffer, memory pool allocation and deallocation APIs")
---
  drivers/scsi/elx/efct/efct_hw.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

Thanks!

-- james

#2 lore raw
In reply to Nathan Chancellor

Nathan,

Quoted 10 lines

clang warns:

drivers/scsi/elx/efct/efct_hw.c:1523:17: warning: address of array 'ctx->buf' will always evaluate to 'true' [-Wpointer-bool-conversion]

                              (!ctx->buf ? U32_MAX : *((u32 *)ctx->buf)));
                               ~~~~~~^~~

buf is an array in the middle of a struct so deferencing it is not a problem as long as ctx is not NULL. Eliminate the check, which fixes the warning.

Applied to 5.14/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering