[RESEND PATCH v2 2/3] scsi: ufs: qcom: use ufshci_version function

2021-03-09 Thread Caleb Connolly
Replace the UFSHCI_VERSION_xy macros.

Signed-off-by: Caleb Connolly 
---
 drivers/scsi/ufs/ufs-qcom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index f97d7b0ae3b6..2d54dce0eeda 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -809,9 +809,9 @@ static u32 ufs_qcom_get_ufs_hci_version(struct ufs_hba *hba)
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
 
if (host->hw_ver.major == 0x1)
-   return UFSHCI_VERSION_11;
+   return ufshci_version(1, 1);
else
-   return UFSHCI_VERSION_20;
+   return ufshci_version(2, 0);
 }
 
 /**
-- 
2.29.2




[PATCH v2 2/3] scsi: ufs: qcom: use ufshci_version function

2021-03-09 Thread Caleb Connolly
Replace the UFSHCI_VERSION_xy macros.

Signed-off-by: Caleb Connolly 
---
 drivers/scsi/ufs/ufs-qcom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index f97d7b0ae3b6..2d54dce0eeda 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -809,9 +809,9 @@ static u32 ufs_qcom_get_ufs_hci_version(struct ufs_hba *hba)
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
 
if (host->hw_ver.major == 0x1)
-   return UFSHCI_VERSION_11;
+   return ufshci_version(1, 1);
else
-   return UFSHCI_VERSION_20;
+   return ufshci_version(2, 0);
 }
 
 /**
-- 
2.29.2