Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / include / ufs / ufshcd.h

diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 431c3afb2ce0f2048d6a50e77d90121ad8557239..f7553293ba98bd0bd6f592216826f99f26ed076a 100644 (file)
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -394,11 +394,6 @@ struct ufs_clk_gating {
        struct workqueue_struct *clk_gating_workq;
 };
 
-struct ufs_saved_pwr_info {
-       struct ufs_pa_layer_attr info;
-       bool is_valid;
-};
-
 /**
  * struct ufs_clk_scaling - UFS clock scaling related data
  * @active_reqs: number of requests that are pending. If this is zero when
@@ -428,7 +423,7 @@ struct ufs_clk_scaling {
        ktime_t window_start_t;
        ktime_t busy_start_t;
        struct device_attribute enable_attr;
-       struct ufs_saved_pwr_info saved_pwr_info;
+       struct ufs_pa_layer_attr saved_pwr_info;
        struct workqueue_struct *workq;
        struct work_struct suspend_work;
        struct work_struct resume_work;
@@ -1099,7 +1094,7 @@ struct ufs_hw_queue {
        void __iomem *mcq_cq_head;
        void __iomem *mcq_cq_tail;
 
-       void *sqe_base_addr;
+       struct utp_transfer_req_desc *sqe_base_addr;
        dma_addr_t sqe_dma_addr;
        struct cq_entry *cqe_base_addr;
        dma_addr_t cqe_dma_addr;