scsi: ufs: ufshpb: Use proper power management API

[ Upstream commit 351b3a849ac7d92449dc75c43db8a857b38387ea ]

In ufshpb, pm_runtime_{get,put}_sync() are used to avoid unwanted runtime
suspend during query requests. Whereas commit b294ff3e3449 ("scsi: ufs:
core: Enable power management for wlun") modified the driver core to use
ufshcd_rpm_{get,put}_sync() APIs.

Switch to these APIs in HPB module as well.

Link: https://lore.kernel.org/r/20210902003534epcms2p1937a0f0eeb48a441cb69f5ef13ff8430@epcms2p1
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Daejun Park <daejun7.park@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
index 026a133149dcecdc46e30cb4c4a270638b137d66..46cdfb0dfca94f2709c6ebb0e7e41b204f35f4b4 100644 (file)
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -2371,11 +2371,11 @@ static int ufshpb_get_lu_info(struct ufs_hba *hba, int lun,
 
        ufshcd_map_desc_id_to_length(hba, QUERY_DESC_IDN_UNIT, &size);
 
-       pm_runtime_get_sync(hba->dev);
+       ufshcd_rpm_get_sync(hba);
        ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC,
                                            QUERY_DESC_IDN_UNIT, lun, 0,
                                            desc_buf, &size);
-       pm_runtime_put_sync(hba->dev);
+       ufshcd_rpm_put_sync(hba);
 
        if (ret) {
                dev_err(hba->dev,
@@ -2598,10 +2598,10 @@ void ufshpb_get_dev_info(struct ufs_hba *hba, u8 *desc_buf)
        if (version == HPB_SUPPORT_LEGACY_VERSION)
                hpb_dev_info->is_legacy = true;
 
-       pm_runtime_get_sync(hba->dev);
+       ufshcd_rpm_get_sync(hba);
        ret = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR,
                QUERY_ATTR_IDN_MAX_HPB_SINGLE_CMD, 0, 0, &max_hpb_single_cmd);
-       pm_runtime_put_sync(hba->dev);
+       ufshcd_rpm_put_sync(hba);
 
        if (ret)
                dev_err(hba->dev, "%s: idn: read max size of single hpb cmd query request failed",