2020-05-28 12:09:22

by Bean Huo

Subject: [PATCH v2 2/3] scsi: ufs: delete ufshcd_read_desc()

From: Bean Huo <[email protected]>

Delete ufshcd_read_desc(). Instead, let caller directly call
ufshcd_read_desc_param().

Signed-off-by: Bean Huo <[email protected]>
---
drivers/scsi/ufs/ufshcd.c | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 0f8c7e05df29..0a95f0a5ab73 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -3221,16 +3221,6 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
return ret;
}

-static inline int ufshcd_read_desc(struct ufs_hba *hba,
- enum desc_idn desc_id,
- int desc_index,
- void *buf,
- u32 size)
-{
- return ufshcd_read_desc_param(hba, desc_id, desc_index, 0, buf, size);
-}
-
-
/**
* struct uc_string_id - unicode string
*
@@ -3278,9 +3268,8 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
if (!uc_str)
return -ENOMEM;

- ret = ufshcd_read_desc(hba, QUERY_DESC_IDN_STRING,
- desc_index, uc_str,
- QUERY_DESC_MAX_SIZE);
+ ret = ufshcd_read_desc_param(hba, QUERY_DESC_IDN_STRING, desc_index, 0,
+ (u8 *)uc_str, QUERY_DESC_MAX_SIZE);
if (ret < 0) {
dev_err(hba->dev, "Reading String Desc failed after %d retries. err = %d\n",
QUERY_REQ_RETRIES, ret);
@@ -6684,8 +6673,8 @@ static void ufshcd_set_active_icc_lvl(struct ufs_hba *hba)
if (!desc_buf)
return;

- ret = ufshcd_read_desc(hba, QUERY_DESC_IDN_POWER, 0,
- desc_buf, buff_len);
+ ret = ufshcd_read_desc_param(hba, QUERY_DESC_IDN_POWER, 0, 0,
+ desc_buf, buff_len);
if (ret) {
dev_err(hba->dev,
"%s: Failed reading power descriptor.len = %d ret = %d",
@@ -6888,8 +6877,8 @@ static int ufs_get_device_desc(struct ufs_hba *hba)
goto out;
}

- err = ufshcd_read_desc(hba, QUERY_DESC_IDN_DEVICE, 0, desc_buf,
- hba->desc_size.dev_desc);
+ err = ufshcd_read_desc_param(hba, QUERY_DESC_IDN_DEVICE, 0, 0, desc_buf,
+ hba->desc_size.dev_desc);
if (err) {
dev_err(hba->dev, "%s: Failed reading Device Desc. err = %d\n",
__func__, err);
@@ -7170,8 +7159,8 @@ static int ufshcd_device_geo_params_init(struct ufs_hba *hba)
goto out;
}

- err = ufshcd_read_desc(hba, QUERY_DESC_IDN_GEOMETRY, 0,
- desc_buf, buff_len);
+ err = ufshcd_read_desc_param(hba, QUERY_DESC_IDN_GEOMETRY, 0, 0,
+ desc_buf, buff_len);
if (err) {
dev_err(hba->dev, "%s: Failed reading Geometry Desc. err = %d\n",
__func__, err);
--
2.17.1

2020-05-28 13:50:12

by Avri Altman

Subject: RE: [PATCH v2 2/3] scsi: ufs: delete ufshcd_read_desc()

>
> From: Bean Huo <[email protected]>
>
> Delete ufshcd_read_desc(). Instead, let caller directly call
> ufshcd_read_desc_param().
>
> Signed-off-by: Bean Huo <[email protected]>
Reviewed-by: Avri Altman <[email protected]>

2020-05-28 15:01:25

by Bart Van Assche

Subject: Re: [PATCH v2 2/3] scsi: ufs: delete ufshcd_read_desc()

On 2020-05-28 04:56, Bean Huo wrote:
> Delete ufshcd_read_desc(). Instead, let caller directly call
> ufshcd_read_desc_param().

Reviewed-by: Bart van Assche <[email protected]>

2020-05-29 01:14:41

by Stanley Chu

Subject: Re: [PATCH v2 2/3] scsi: ufs: delete ufshcd_read_desc()

On Thu, 2020-05-28 at 13:56 +0200, Bean Huo wrote:
> From: Bean Huo <[email protected]>
>
> Delete ufshcd_read_desc(). Instead, let caller directly call
> ufshcd_read_desc_param().
>
> Signed-off-by: Bean Huo <[email protected]>
> ---
> drivers/scsi/ufs/ufshcd.c | 27 ++++++++-------------------
> 1 file changed, 8 insertions(+), 19 deletions(-)

Reviewed-by: Stanley Chu <[email protected]>