shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: scsi: ufs: Do not use the struct scsi_request cmd field

Browse Source 
This patch is a subset of the upstream commit ce70fd9a55 ("scsi: core:
Remove the cmd field from struct scsi_request").

Bug: 234653003
Change-Id: Ie1b93162025e732d192b7866b865a683113c157b
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Bart Van Assche
2022-06-01 12:51:38 -07:00
parent 8206d48ec2
commit 262a7bbdcc
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/scsi/ufs/ufshpb.c
View File

@@ -666,17 +666,16 @@ static void ufshpb_execute_umap_req(struct ufshpb_lu *hpb,
struct ufshpb_req *umap_req,
struct ufshpb_region *rgn)
{
struct request *req;
struct scsi_request *rq;
struct request *req = umap_req->req;
struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(req);
req = umap_req->req;
req->timeout = 0;
req->end_io_data = (void *)umap_req;
rq = scsi_req(req);
ufshpb_set_unmap_cmd(rq->cmd, rgn);
rq->cmd_len = HPB_WRITE_BUFFER_CMD_LENGTH;
req->end_io_data = umap_req;
blk_execute_rq_nowait(NULL, req, 1, ufshpb_umap_req_compl_fn);
ufshpb_set_unmap_cmd(scmd->cmnd, rgn);
scmd->cmd_len = HPB_WRITE_BUFFER_CMD_LENGTH;
blk_execute_rq_nowait(NULL, req, true, ufshpb_umap_req_compl_fn);
hpb->stats.umap_req_cnt++;
}
@@ -686,7 +685,7 @@ static int ufshpb_execute_map_req(struct ufshpb_lu *hpb,
{
struct request_queue *q;
struct request *req;
struct scsi_request *rq;
struct scsi_cmnd *scmd;
int mem_size = hpb->srgn_mem_size;
int ret = 0;
int i;
@@ -709,16 +708,15 @@ static int ufshpb_execute_map_req(struct ufshpb_lu *hpb,
req->end_io_data = map_req;
rq = scsi_req(req);
if (unlikely(last))
mem_size = hpb->last_srgn_entries * HPB_ENTRY_SIZE;
ufshpb_set_read_buf_cmd(rq->cmd, map_req->rb.rgn_idx,
scmd = blk_mq_rq_to_pdu(req);
ufshpb_set_read_buf_cmd(scmd->cmnd, map_req->rb.rgn_idx,
map_req->rb.srgn_idx, mem_size);
rq->cmd_len = HPB_READ_BUFFER_CMD_LENGTH;
scmd->cmd_len = HPB_READ_BUFFER_CMD_LENGTH;
blk_execute_rq_nowait(NULL, req, 1, ufshpb_map_req_compl_fn);
blk_execute_rq_nowait(NULL, req, true, ufshpb_map_req_compl_fn);
hpb->stats.map_req_cnt++;
return 0;