fuzz cleanup for ufs patch

diff --git a/queue-5.10/scsi-ufs-clear-uac-for-ffu-and-rpmb-luns.patch b/queue-5.10/scsi-ufs-clear-uac-for-ffu-and-rpmb-luns.patch
index 9fe7f4e2ec54e57f31896b133fd4ea422ad7241c..74288134db38d196797a5ec403906b900baeb28b 100644 (file)
--- a/queue-5.10/scsi-ufs-clear-uac-for-ffu-and-rpmb-luns.patch
+++ b/queue-5.10/scsi-ufs-clear-uac-for-ffu-and-rpmb-luns.patch
@@ -16,15 +16,13 @@ Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/scsi/ufs/ufshcd.c | 70 +++++++++++++++++++++++++++++++++++----
- drivers/scsi/ufs/ufshcd.h |  1 +
+ drivers/scsi/ufs/ufshcd.c |   70 ++++++++++++++++++++++++++++++++++++++++++----
+ drivers/scsi/ufs/ufshcd.h |    1 
  2 files changed, 65 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
-index ec7005bcf61d8..a6382e688082d 100644
 --- a/drivers/scsi/ufs/ufshcd.c
 +++ b/drivers/scsi/ufs/ufshcd.c
-@@ -7095,7 +7095,6 @@ static inline void ufshcd_blk_pm_runtime_init(struct scsi_device *sdev)
+@@ -7093,7 +7093,6 @@ static inline void ufshcd_blk_pm_runtime
  static int ufshcd_scsi_add_wlus(struct ufs_hba *hba)
  {
        int ret = 0;
@@ -32,7 +30,7 @@ index ec7005bcf61d8..a6382e688082d 100644
        struct scsi_device *sdev_boot;
  
        hba->sdev_ufs_device = __scsi_add_device(hba->host, 0, 0,
-@@ -7108,14 +7107,14 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba)
+@@ -7106,14 +7105,14 @@ static int ufshcd_scsi_add_wlus(struct u
        ufshcd_blk_pm_runtime_init(hba->sdev_ufs_device);
        scsi_device_put(hba->sdev_ufs_device);
  
@@ -52,7 +50,7 @@ index ec7005bcf61d8..a6382e688082d 100644
  
        sdev_boot = __scsi_add_device(hba->host, 0, 0,
                ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_BOOT_WLUN), NULL);
-@@ -7639,6 +7638,63 @@ out:
+@@ -7637,6 +7636,63 @@ out:
        return ret;
  }
  
@@ -116,7 +114,7 @@ index ec7005bcf61d8..a6382e688082d 100644
  /**
   * ufshcd_probe_hba - probe hba to detect device and initialize
   * @hba: per-adapter instance
-@@ -7758,6 +7814,8 @@ out:
+@@ -7756,6 +7812,8 @@ out:
                pm_runtime_put_sync(hba->dev);
                ufshcd_exit_clk_scaling(hba);
                ufshcd_hba_exit(hba);
@@ -125,8 +123,6 @@ index ec7005bcf61d8..a6382e688082d 100644
        }
  }
  
-diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
-index cd51553e522da..6c62a281c8631 100644
 --- a/drivers/scsi/ufs/ufshcd.h
 +++ b/drivers/scsi/ufs/ufshcd.h
 @@ -683,6 +683,7 @@ struct ufs_hba {
@@ -137,6 +133,3 @@ index cd51553e522da..6c62a281c8631 100644
  
        enum ufs_dev_pwr_mode curr_dev_pwr_mode;
        enum uic_link_state uic_link_state;
--- 
-2.27.0
-