summaryrefslogtreecommitdiff
path: root/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch
diff options
context:
space:
mode:
Diffstat (limited to 'android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch')
-rw-r--r--android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch b/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch
index 0c02b275..1a3cbb31 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch
@@ -28,7 +28,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
-@@ -3205,7 +3205,7 @@ static inline void ufshcd_init_query(struct ufs_hba *hba,
+@@ -3301,7 +3301,7 @@ static inline void ufshcd_init_query(struct ufs_hba *hba,
(*request)->upiu_req.selector = selector;
}
@@ -37,7 +37,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
enum query_opcode opcode, enum flag_idn idn, u8 index, bool *flag_res)
{
int ret;
-@@ -3227,6 +3227,7 @@ static int ufshcd_query_flag_retry(struct ufs_hba *hba,
+@@ -3323,6 +3323,7 @@ static int ufshcd_query_flag_retry(struct ufs_hba *hba,
__func__, opcode, idn, ret, retries);
return ret;
}
@@ -45,7 +45,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
/**
* ufshcd_query_flag() - API function for sending flag query requests
-@@ -3295,6 +3296,7 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
+@@ -3391,6 +3392,7 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
ufshcd_release(hba);
return err;
}
@@ -53,7 +53,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
/**
* ufshcd_query_attr - API function for sending attribute requests
-@@ -3358,6 +3360,7 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
+@@ -3454,6 +3456,7 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
ufshcd_release(hba);
return err;
}
@@ -61,7 +61,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
/**
* ufshcd_query_attr_retry() - API function for sending query
-@@ -3395,6 +3398,7 @@ int ufshcd_query_attr_retry(struct ufs_hba *hba,
+@@ -3491,6 +3494,7 @@ int ufshcd_query_attr_retry(struct ufs_hba *hba,
__func__, idn, ret, QUERY_REQ_RETRIES);
return ret;
}
@@ -69,7 +69,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
static int __ufshcd_query_descriptor(struct ufs_hba *hba,
enum query_opcode opcode, enum desc_idn idn, u8 index,
-@@ -3491,6 +3495,7 @@ int ufshcd_query_descriptor_retry(struct ufs_hba *hba,
+@@ -3587,6 +3591,7 @@ int ufshcd_query_descriptor_retry(struct ufs_hba *hba,
return err;
}
@@ -77,7 +77,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
/**
* ufshcd_read_desc_param - read the specified descriptor parameter
-@@ -3570,6 +3575,7 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
+@@ -3666,6 +3671,7 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
kfree(desc_buf);
return ret;
}
@@ -85,7 +85,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
/**
* struct uc_string_id - unicode string
-@@ -5786,7 +5792,7 @@ static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status)
+@@ -5883,7 +5889,7 @@ static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status)
* to know whether auto bkops is enabled or disabled after this function
* returns control to it.
*/
@@ -94,7 +94,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
enum bkops_status status)
{
int err;
-@@ -5811,6 +5817,7 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba,
+@@ -5908,6 +5914,7 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba,
out:
return err;
}
@@ -105,7 +105,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
-@@ -1396,6 +1396,14 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
+@@ -1400,6 +1400,14 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
u8 param_offset,
u8 *param_read_buf,
u8 param_size);