From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Fri, 21 Oct 2022 01:10:34 +0000 (+0000)
Subject: Merge branch '6.1/scsi-queue' into 6.1/scsi-fixes
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=47eee861fa91b308800968d988975f4b9de54458;p=kernel.git

Merge branch '6.1/scsi-queue' into 6.1/scsi-fixes

Include the patches that weren't included in the 6.1 pull request.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

47eee861fa91b308800968d988975f4b9de54458
diff --cc drivers/ufs/core/ufshpb.c
index 3d69a81c5b178,0ce5063bedc57..7d56c9b4f7a80
--- a/drivers/ufs/core/ufshpb.c
+++ b/drivers/ufs/core/ufshpb.c
@@@ -613,19 -613,16 +613,19 @@@ static void ufshpb_activate_subregion(s
  	srgn->srgn_state = HPB_SRGN_VALID;
  }
  
 -static void ufshpb_umap_req_compl_fn(struct request *req, blk_status_t error)
 +static enum rq_end_io_ret ufshpb_umap_req_compl_fn(struct request *req,
 +						   blk_status_t error)
  {
- 	struct ufshpb_req *umap_req = (struct ufshpb_req *)req->end_io_data;
+ 	struct ufshpb_req *umap_req = req->end_io_data;
  
  	ufshpb_put_req(umap_req->hpb, umap_req);
 +	return RQ_END_IO_NONE;
  }
  
 -static void ufshpb_map_req_compl_fn(struct request *req, blk_status_t error)
 +static enum rq_end_io_ret ufshpb_map_req_compl_fn(struct request *req,
 +						  blk_status_t error)
  {
- 	struct ufshpb_req *map_req = (struct ufshpb_req *) req->end_io_data;
+ 	struct ufshpb_req *map_req = req->end_io_data;
  	struct ufshpb_lu *hpb = map_req->hpb;
  	struct ufshpb_subregion *srgn;
  	unsigned long flags;