scsi: ufs: Remove dead code
authorBart Van Assche <bvanassche@acm.org>
Fri, 3 Dec 2021 23:19:38 +0000 (15:19 -0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 7 Dec 2021 03:30:33 +0000 (22:30 -0500)
Commit 7252a3603015 ("scsi: ufs: Avoid busy-waiting by eliminating tag
conflicts") guarantees that 'tag' is not in use by any SCSI command.
Remove the check that returns early if a conflict occurs.

Link: https://lore.kernel.org/r/20211203231950.193369-6-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Acked-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufshcd.c

index 973b7b083dbe9d4ceb7d92df27b7a162f81e4c13..d4996ada55b60c9e34e10e9b06ca2067d35941a9 100644 (file)
@@ -6730,11 +6730,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
        tag = req->tag;
        WARN_ONCE(tag < 0, "Invalid tag %d\n", tag);
 
-       if (unlikely(test_bit(tag, &hba->outstanding_reqs))) {
-               err = -EBUSY;
-               goto out;
-       }
-
        lrbp = &hba->lrb[tag];
        WARN_ON(lrbp->cmd);
        lrbp->cmd = NULL;
@@ -6802,8 +6797,8 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
        ufshcd_add_query_upiu_trace(hba, err ? UFS_QUERY_ERR : UFS_QUERY_COMP,
                                    (struct utp_upiu_req *)lrbp->ucd_rsp_ptr);
 
-out:
        blk_mq_free_request(req);
+
 out_unlock:
        up_read(&hba->clk_scaling_lock);
        return err;