From bfcb3876f56d08552161542912769846b6c9fe8d Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Wed, 10 Mar 2021 15:33:51 +0000 Subject: [PATCH] FROMGIT: scsi: ufs: qcom: Use ufshci_version() function Replace the UFSHCI_VERSION_xy macros. Link: https://lore.kernel.org/r/20210310153215.371227-3-caleb@connolly.tech Reviewed-by: Bean Huo Signed-off-by: Caleb Connolly Signed-off-by: Martin K. Petersen Bug: 190637035 (cherry picked from commit 1d8613a23f3c3b8f0101e453ff150e05a0d1cd4f git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git 5.14/scsi-staging) Change-Id: Ife086db4f8837bb7aa9fabf47e77cb5aea284903 Signed-off-by: Can Guo --- 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 1f52f6817524..9fe3b93440f6 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -838,9 +838,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); } /**