scsi: ufs: qcom: Rename "hs_gear" to "phy_gear"

The "hs_gear" variable is used to cache the gear setting for the PHY that
will be used during ufs_qcom_power_up_sequence(). But it creates ambiguity
with the gear setting used by the ufshcd driver.

So let's rename it to "phy_gear" to make it explicit that this variable
caches the gear setting for the PHY.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20230908145329.154024-2-manivannan.sadhasivam@linaro.org
Reviewed-by: Can Guo <quic_cang@quicinc.com>
Tested-by: Can Guo <quic_cang@quicinc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 4eb0581578a1b17fa867fa7344cc86eddb18ae2d..a6078d5939ed9f9e0b069524e4defe1bfd0c7d2f 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -459,7 +459,7 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
                return ret;
        }
 
-       phy_set_mode_ext(phy, PHY_MODE_UFS_HS_B, host->hs_gear);
+       phy_set_mode_ext(phy, PHY_MODE_UFS_HS_B, host->phy_gear);
 
        /* power on phy - start serdes and phy's power and clocks */
        ret = phy_power_on(phy);
@@ -924,12 +924,12 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
                }
 
                /*
-                * Update hs_gear only when the gears are scaled to a higher value. This is because,
-                * the PHY gear settings are backwards compatible and we only need to change the PHY
-                * settings while scaling to higher gears.
+                * Update phy_gear only when the gears are scaled to a higher value. This is
+                * because, the PHY gear settings are backwards compatible and we only need to
+                * change the PHY gear settings while scaling to higher gears.
                 */
-               if (dev_req_params->gear_tx > host->hs_gear)
-                       host->hs_gear = dev_req_params->gear_tx;
+               if (dev_req_params->gear_tx > host->phy_gear)
+                       host->phy_gear = dev_req_params->gear_tx;
 
                /* enable the device ref clock before changing to HS mode */
                if (!ufshcd_is_hs_mode(&hba->pwr_info) &&
@@ -1296,7 +1296,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)
         * Power up the PHY using the minimum supported gear (UFS_HS_G2).
         * Switching to max gear will be performed during reinit if supported.
         */
-       host->hs_gear = UFS_HS_G2;
+       host->phy_gear = UFS_HS_G2;
 
        return 0;
 

diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h
index 264d429e72fec8226d90b0a0141eb9cb54ba9bd0..9950a0089475fca3088c3d58551600cad3cfb538 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.h
+++ b/drivers/ufs/host/ufs-qcom.h
@@ -240,7 +240,7 @@ struct ufs_qcom_host {
 
        struct gpio_desc *device_reset;
 
-       u32 hs_gear;
+       u32 phy_gear;
 
        bool esi_enabled;
 };