]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
scsi: ufs: Change upiu_flags to be u8
authorBean Huo <beanhuo@micron.com>
Mon, 6 Jul 2020 12:39:36 +0000 (14:39 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 8 Jul 2020 05:08:14 +0000 (01:08 -0400)
According to the UFS Spec, the Flags field in the UPIU is one byte in size,
not 4. Change it to be u8.

Link: https://lore.kernel.org/r/20200706123936.24799-1-huobean@gmail.com
Tested-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufshcd.c

index 59358bb7501471163b15768b0e2b1d53c279cd58..4bb48a542ee0a29295701e7e1aea2b1ae76b7292 100644 (file)
@@ -2240,7 +2240,7 @@ static void ufshcd_disable_intr(struct ufs_hba *hba, u32 intrs)
  * @cmd_dir: requests data direction
  */
 static void ufshcd_prepare_req_desc_hdr(struct ufshcd_lrb *lrbp,
-                       u32 *upiu_flags, enum dma_data_direction cmd_dir)
+                       u8 *upiu_flags, enum dma_data_direction cmd_dir)
 {
        struct utp_transfer_req_desc *req_desc = lrbp->utr_descriptor_ptr;
        u32 data_direction;
@@ -2286,7 +2286,7 @@ static void ufshcd_prepare_req_desc_hdr(struct ufshcd_lrb *lrbp,
  * @upiu_flags: flags
  */
 static
-void ufshcd_prepare_utp_scsi_cmd_upiu(struct ufshcd_lrb *lrbp, u32 upiu_flags)
+void ufshcd_prepare_utp_scsi_cmd_upiu(struct ufshcd_lrb *lrbp, u8 upiu_flags)
 {
        struct scsi_cmnd *cmd = lrbp->cmd;
        struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr;
@@ -2319,7 +2319,7 @@ void ufshcd_prepare_utp_scsi_cmd_upiu(struct ufshcd_lrb *lrbp, u32 upiu_flags)
  * @upiu_flags: flags
  */
 static void ufshcd_prepare_utp_query_req_upiu(struct ufs_hba *hba,
-                               struct ufshcd_lrb *lrbp, u32 upiu_flags)
+                               struct ufshcd_lrb *lrbp, u8 upiu_flags)
 {
        struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr;
        struct ufs_query *query = &hba->dev_cmd.query;
@@ -2375,7 +2375,7 @@ static inline void ufshcd_prepare_utp_nop_upiu(struct ufshcd_lrb *lrbp)
  */
 static int ufshcd_comp_devman_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
 {
-       u32 upiu_flags;
+       u8 upiu_flags;
        int ret = 0;
 
        if ((hba->ufs_version == UFSHCI_VERSION_10) ||
@@ -2403,7 +2403,7 @@ static int ufshcd_comp_devman_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
  */
 static int ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
 {
-       u32 upiu_flags;
+       u8 upiu_flags;
        int ret = 0;
 
        if ((hba->ufs_version == UFSHCI_VERSION_10) ||
@@ -6121,7 +6121,7 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
        int tag;
        struct completion wait;
        unsigned long flags;
-       u32 upiu_flags;
+       u8 upiu_flags;
 
        down_read(&hba->clk_scaling_lock);