Skip to contentSkip to conversation

megaraid: fixup debug message in megaraid_abort_and_reset()

PATCH Applied Hannes Reinecke 3 participants 4 messages Oct 23, 2023 – Oct 30, 2023

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

PATCH 1/1 megaraid: fixup debug message in megaraid_abort_and_reset()

Found by Smatch.

Fixes 5bcd3bfbda02 ("scsi: megaraid: Pass in NULL scb for host reset")
---
 drivers/scsi/megaraid.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/scsi/megaraid.c +6 -4
index 329c3da88416..d59964ceef47 100644
@@ -1925,10 +1925,12 @@ megaraid_abort_and_reset(adapter_t *adapter, struct scsi_cmnd *cmd, int aor)
 	struct list_head	*pos, *next;
 	scb_t			*scb;
 
-	dev_warn(&adapter->dev->dev, "%s cmd=%x <c=%d t=%d l=%d>\n",
-	     (aor == SCB_ABORT)? "ABORTING":"RESET",
-	     cmd->cmnd[0], cmd->device->channel,
-	     cmd->device->id, (u32)cmd->device->lun);
+	if (aor == SCB_ABORT)
+		dev_warn(&adapter->dev->dev, "ABORTING cmd=%x <c=%d t=%d l=%d>\n",
+			 cmd->cmnd[0], cmd->device->channel,
+			 cmd->device->id, (u32)cmd->device->lun);
+	else
+		dev_warn(&adapter->dev->dev, "RESETTING\n");
 
 	if(list_empty(&adapter->pending_list))
 		return FAILED;
Signature · 1 line
2.35.3
#1 lore raw

drivers/scsi/megaraid.c megaraid_abort_and_reset(adapter_t *adapter, struct scsi_cmnd *cmd, int aor) · line 1929

Quoted 10 lines · Hannes Reinecke
drivers/scsi/megaraid.c +2 -4
@@ -1925,10 +1925,12 @@ megaraid_abort_and_reset(adapter_t *adapter, struct scsi_cmnd *cmd, int aor)
 	struct list_head	*pos, *next;
 	scb_t			*scb;
 
-	dev_warn(&adapter->dev->dev, "%s cmd=%x <c=%d t=%d l=%d>\n",
-	     (aor == SCB_ABORT)? "ABORTING":"RESET",
-	     cmd->cmnd[0], cmd->device->channel,
-	     cmd->device->id, (u32)cmd->device->lun);
+	if (aor == SCB_ABORT)
+		dev_warn(&adapter->dev->dev, "ABORTING cmd=%x <c=%d t=%d l=%d>\n",

Please avoid the overly long line here.

Otherwise looks good.