Skip to content

Commit

Permalink
scsi: ufs: Remove dead code
Browse files Browse the repository at this point in the history
commit d77ea82 upstream.

Commit 7252a36 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
bvanassche authored and gregkh committed Feb 23, 2022
1 parent 934c8c9 commit 84fdbb0
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/scsi/ufs/ufshcd.c
Expand Up @@ -6734,11 +6734,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;
Expand Down Expand Up @@ -6806,8 +6801,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;
Expand Down

0 comments on commit 84fdbb0

Please sign in to comment.