Skip to contentSkip to conversation

scsi: ufs: Remove useless if-state in ufshcd_add_command_trace

PATCH Applied Bean Huo 3 participants 4 messages Aug 2, 2021 – Aug 10, 2021 SCSI

lore
Share & tools
lore

Bean Huo

author
#0 lore raw

PATCH 1/1 scsi: ufs: Remove useless if-state in ufshcd_add_command_trace

From: Bean Huo <[email protected]>

ufshcd_add_cmd_upiu_trace() will be called anyway, so move if-state down, make code simpler.

---
 drivers/scsi/ufs/ufshcd.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufshcd.c +3 -6
index 064a44e628d6..02f54153fd6d 100644
@@ -380,14 +380,11 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
 	if (!cmd)
 		return;
 
-	if (!trace_ufshcd_command_enabled()) {
-		/* trace UPIU W/O tracing command */
-		ufshcd_add_cmd_upiu_trace(hba, tag, str_t);
-		return;
-	}
-
 	/* trace UPIU also */
 	ufshcd_add_cmd_upiu_trace(hba, tag, str_t);
+	if (!trace_ufshcd_command_enabled())
+		return;
+
 	opcode = cmd->cmnd[0];
 	lba = scsi_get_lba(cmd);
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines

From: Bean Huo <[email protected]>

ufshcd_add_cmd_upiu_trace() will be called anyway, so move if-state down, make code simpler.

Quoted 29 lines
---
 drivers/scsi/ufs/ufshcd.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0 -0

064a44e628d6..02f54153fd6d 100644

drivers/scsi/ufs/ufshcd.c +3 -7
@@ -380,14 +380,11 @@ static void ufshcd_add_command_trace(struct
 ufs_hba *hba, unsigned int tag,
        if (!cmd)
                return;
 
-       if (!trace_ufshcd_command_enabled()) {
-               /* trace UPIU W/O tracing command */
-               ufshcd_add_cmd_upiu_trace(hba, tag, str_t);
-               return;
-       }
-
        /* trace UPIU also */
        ufshcd_add_cmd_upiu_trace(hba, tag, str_t);
+       if (!trace_ufshcd_command_enabled())
+               return;
+
        opcode = cmd->cmnd[0];
        lba = scsi_get_lba(cmd);
 
--

2.25.1

#2 lore raw
In reply to Bean Huo

Bean,

Quoted 2 lines

ufshcd_add_cmd_upiu_trace() will be called anyway, so move if-state down, make code simpler.

Applied to 5.15/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering