From e9ca328c8c911383d25e398abe2f278dc3e14c14 Mon Sep 17 00:00:00 2001 From: Avri Altman Date: Tue, 5 Jan 2021 12:34:46 +0100 Subject: [PATCH] UPSTREAM: scsi: ufs: A tad optimization in query upiu trace Remove a redundant if clause in ufshcd_add_query_upiu_trace. Link: https://lore.kernel.org/r/20210110084618.189371-1-avri.altman@wdc.com Reviewed-by: Bean Huo Signed-off-by: Avri Altman Signed-off-by: Martin K. Petersen (cherry picked from commit fb475b74d6630e934718d195ac209f303846dbe9) Bug: 204438323 Change-Id: Id1968a12559b5205cdc7674f1ac536c1d085a440 Signed-off-by: Bart Van Assche --- drivers/scsi/ufs/ufshcd.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 6318dc5845fc..d2ba59a199c9 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -320,19 +320,13 @@ static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag, UFS_TSF_CDB); } -static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, unsigned int tag, - enum ufs_trace_str_t str_t) +static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, + enum ufs_trace_str_t str_t, + struct utp_upiu_req *rq_rsp) { - struct utp_upiu_req *rq_rsp; - if (!trace_ufshcd_upiu_enabled()) return; - if (str_t == UFS_QUERY_SEND) - rq_rsp = hba->lrb[tag].ucd_req_ptr; - else - rq_rsp = (struct utp_upiu_req *)hba->lrb[tag].ucd_rsp_ptr; - trace_ufshcd_upiu(dev_name(hba->dev), str_t, &rq_rsp->header, &rq_rsp->qr, UFS_TSF_OSF); } @@ -3008,14 +3002,14 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba, hba->dev_cmd.complete = &wait; - ufshcd_add_query_upiu_trace(hba, tag, UFS_QUERY_SEND); + ufshcd_add_query_upiu_trace(hba, UFS_QUERY_SEND, lrbp->ucd_req_ptr); /* Make sure descriptors are ready before ringing the doorbell */ wmb(); ufshcd_send_command(hba, tag); err = ufshcd_wait_for_dev_cmd(hba, lrbp, timeout); - ufshcd_add_query_upiu_trace(hba, tag, - err ? UFS_QUERY_ERR : UFS_QUERY_COMP); + ufshcd_add_query_upiu_trace(hba, err ? UFS_QUERY_ERR : UFS_QUERY_COMP, + (struct utp_upiu_req *)lrbp->ucd_rsp_ptr); out: blk_put_request(req);