Commit d77ea822 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: Remove dead code 

Commit 7252a360 ("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: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Acked-by: default avatarAvri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 59830c09

drivers/scsi/ufs/ufshcd.c

+1 −6
Original line number Diff line number Diff line
@@ -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;