scsi: ufs: core: Only call ufshcd_add_command_trace() for SCSI commands

Instead of checking inside ufshcd_add_command_trace() whether 'cmd'
points at a SCSI command, let the caller perform that check. This patch
prepares for removing the lrbp->cmd pointer.

Reviewed-by: Avri Altman <avri.altman@sandisk.com>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20251031204029.2883185-11-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index cdb8147fceb97ee7d50730e951d04fe18b394f85..87892a13ef571a2eae54264f492ccf060e85abab 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -486,9 +486,6 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
        struct request *rq = scsi_cmd_to_rq(cmd);
        int transfer_len = -1;
 
-       if (!cmd)
-               return;
-
        /* trace UPIU also */
        ufshcd_add_cmd_upiu_trace(hba, lrbp, str_t);
        if (!trace_ufshcd_command_enabled())
@@ -2369,9 +2366,10 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag,
                lrbp->compl_time_stamp = ktime_set(0, 0);
                lrbp->compl_time_stamp_local_clock = 0;
        }
-       ufshcd_add_command_trace(hba, task_tag, UFS_CMD_SEND);
-       if (lrbp->cmd)
+       if (lrbp->cmd) {
+               ufshcd_add_command_trace(hba, task_tag, UFS_CMD_SEND);
                ufshcd_clk_scaling_start_busy(hba);
+       }
        if (unlikely(ufshcd_should_inform_monitor(hba, lrbp)))
                ufshcd_start_monitor(hba, lrbp);