[PATCH v2] scsi: ufs: Remove redundant function definitions from ufshcd.h

[PATCH v2] scsi: ufs: Remove redundant function definitions from ufshcd.h

[Arthur Simchaev]

v1->v2: Remove redundant comment, modify commit message

This patch removes Query-Request API functions declaration from
include/ufs/ufshcd.h. Those declarations solely to
ufs core private header.

Signed-off-by: Arthur Simchaev <Arthur.Simchaev@wdc.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
---
 drivers/ufs/core/ufshcd-priv.h |  5 +++++
 include/ufs/ufshcd.h           | 20 --------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index d00dba1..f68ca33 100644
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -42,6 +42,11 @@ static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}
 static inline void ufs_hwmon_notify_event(struct ufs_hba *hba, u8 ee_mask) {}
 #endif
 
+int ufshcd_query_descriptor_retry(struct ufs_hba *hba,
+				  enum query_opcode opcode,
+				  enum desc_idn idn, u8 index,
+				  u8 selector,
+				  u8 *desc_buf, int *buf_len);
 int ufshcd_read_desc_param(struct ufs_hba *hba,
 			   enum desc_idn desc_id,
 			   int desc_index,
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 24c97e0..9f28349 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -1175,26 +1175,6 @@ static inline int ufshcd_disable_host_tx_lcc(struct ufs_hba *hba)
 	return ufshcd_dme_set(hba, UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE), 0);
 }
 
-/* Expose Query-Request API */
-int ufshcd_query_descriptor_retry(struct ufs_hba *hba,
-				  enum query_opcode opcode,
-				  enum desc_idn idn, u8 index,
-				  u8 selector,
-				  u8 *desc_buf, int *buf_len);
-int ufshcd_read_desc_param(struct ufs_hba *hba,
-			   enum desc_idn desc_id,
-			   int desc_index,
-			   u8 param_offset,
-			   u8 *param_read_buf,
-			   u8 param_size);
-int ufshcd_query_attr_retry(struct ufs_hba *hba, enum query_opcode opcode,
-			    enum attr_idn idn, u8 index, u8 selector,
-			    u32 *attr_val);
-int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
-		      enum attr_idn idn, u8 index, u8 selector, u32 *attr_val);
-int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
-	enum flag_idn idn, u8 index, bool *flag_res);
-
 void ufshcd_auto_hibern8_enable(struct ufs_hba *hba);
 void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit);
 void ufshcd_fixup_dev_quirks(struct ufs_hba *hba,
-- 
2.7.4

Re: [PATCH v2] scsi: ufs: Remove redundant function definitions from ufshcd.h

[Bart Van Assche]

On 9/21/22 04:58, Arthur Simchaev wrote:
> v1->v2: Remove redundant comment, modify commit message
> 
> This patch removes Query-Request API functions declaration from
> include/ufs/ufshcd.h. Those declarations solely to
> ufs core private header.
> 
> Signed-off-by: Arthur Simchaev <Arthur.Simchaev@wdc.com>
> Reviewed-by: Bean Huo <beanhuo@micron.com>

The changelog (v1->v2) should occur under the three hyphens (---) and 
Reviewed-by tags should occur before the Signed-off-by tag.

Anyway:

Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Re: [PATCH v2] scsi: ufs: Remove redundant function definitions from ufshcd.h

[Martin K. Petersen]

Arthur,

> This patch removes Query-Request API functions declaration from
> include/ufs/ufshcd.h. Those declarations solely to ufs core private
> header.

Applied to 6.1/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering