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

Message ID 20210617063123.21239-1-nathan@kernel.org
State New
Headers show
Series
  • scsi: elx: efct: Eliminate unnecessary boolean check in efct_hw_command_cancel()
Related show

Commit Message

Nathan Chancellor June 17, 2021, 6:31 a.m.
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")
Link: https://github.com/ClangBuiltLinux/linux/issues/1398
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
 drivers/scsi/elx/efct/efct_hw.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


base-commit: ebc076b3eddc807729bd81f7bc48e798a3ddc477

Comments

James Smart June 18, 2021, 10:54 p.m. | #1
On 6/16/2021 11:31 PM, Nathan Chancellor wrote:
> 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")

> Link: https://github.com/ClangBuiltLinux/linux/issues/1398

> Signed-off-by: Nathan Chancellor <nathan@kernel.org>

> ---

>   drivers/scsi/elx/efct/efct_hw.c | 3 +--

>   1 file changed, 1 insertion(+), 2 deletions(-)


Thanks!

Reviewed-by: James Smart <jsmart2021@gmail.com>


-- james
Martin K. Petersen June 19, 2021, 2:32 a.m. | #2
Nathan,

> 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!

-- 
Martin K. Petersen	Oracle Linux Engineering

Patch

diff --git a/drivers/scsi/elx/efct/efct_hw.c b/drivers/scsi/elx/efct/efct_hw.c
index ce4736c41564..5b508d49e5a5 100644
--- a/drivers/scsi/elx/efct/efct_hw.c
+++ b/drivers/scsi/elx/efct/efct_hw.c
@@ -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);