]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
scsi: ufs: qcom: Remove dead code in ufs_qcom_cfg_timers()
authorBao D. Nguyen <quic_nguyenb@quicinc.com>
Wed, 19 Feb 2025 17:16:06 +0000 (09:16 -0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 21 Feb 2025 02:23:45 +0000 (21:23 -0500)
Since 'commit 104cd58d9af8 ("scsi: ufs: qcom: Remove support for host
controllers older than v2.0")', some of the parameters passed into the
ufs_qcom_cfg_timers() function have become dead code. Clean up
ufs_qcom_cfg_timers() function to improve the readability.

Signed-off-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
Link: https://lore.kernel.org/r/547c484ce80fe3624ee746954b84cae28bd38a09.1739985266.git.quic_nguyenb@quicinc.com
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/host/ufs-qcom.c

index 45eabccdfa31698a98c916aa788c07512c004e60..dee00f9a1281347cb853b1c8daf3cda588f9bff1 100644 (file)
@@ -536,16 +536,10 @@ static int ufs_qcom_hce_enable_notify(struct ufs_hba *hba,
  * ufs_qcom_cfg_timers - Configure ufs qcom cfg timers
  *
  * @hba: host controller instance
- * @gear: Current operating gear
- * @hs: current power mode
- * @rate: current operating rate (A or B)
- * @update_link_startup_timer: indicate if link_start ongoing
  * @is_pre_scale_up: flag to check if pre scale up condition.
  * Return: zero for success and non-zero in case of a failure.
  */
-static int ufs_qcom_cfg_timers(struct ufs_hba *hba, u32 gear,
-                              u32 hs, u32 rate, bool update_link_startup_timer,
-                              bool is_pre_scale_up)
+static int ufs_qcom_cfg_timers(struct ufs_hba *hba, bool is_pre_scale_up)
 {
        struct ufs_qcom_host *host = ufshcd_get_variant(hba);
        struct ufs_clk_info *clki;
@@ -561,11 +555,6 @@ static int ufs_qcom_cfg_timers(struct ufs_hba *hba, u32 gear,
        if (host->hw_ver.major < 4 && !ufshcd_is_intr_aggr_allowed(hba))
                return 0;
 
-       if (gear == 0) {
-               dev_err(hba->dev, "%s: invalid gear = %d\n", __func__, gear);
-               return -EINVAL;
-       }
-
        list_for_each_entry(clki, &hba->clk_list_head, list) {
                if (!strcmp(clki->name, "core_clk")) {
                        if (is_pre_scale_up)
@@ -601,8 +590,7 @@ static int ufs_qcom_link_startup_notify(struct ufs_hba *hba,
 
        switch (status) {
        case PRE_CHANGE:
-               if (ufs_qcom_cfg_timers(hba, UFS_PWM_G1, SLOWAUTO_MODE,
-                                       0, true, false)) {
+               if (ufs_qcom_cfg_timers(hba, false)) {
                        dev_err(hba->dev, "%s: ufs_qcom_cfg_timers() failed\n",
                                __func__);
                        return -EINVAL;
@@ -858,9 +846,7 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
                }
                break;
        case POST_CHANGE:
-               if (ufs_qcom_cfg_timers(hba, dev_req_params->gear_rx,
-                                       dev_req_params->pwr_rx,
-                                       dev_req_params->hs_rate, false, false)) {
+               if (ufs_qcom_cfg_timers(hba, false)) {
                        dev_err(hba->dev, "%s: ufs_qcom_cfg_timers() failed\n",
                                __func__);
                        /*
@@ -1385,12 +1371,9 @@ static int ufs_qcom_set_core_clk_ctrl(struct ufs_hba *hba, bool is_scale_up)
 
 static int ufs_qcom_clk_scale_up_pre_change(struct ufs_hba *hba)
 {
-       struct ufs_qcom_host *host = ufshcd_get_variant(hba);
-       struct ufs_pa_layer_attr *attr = &host->dev_req_params;
        int ret;
 
-       ret = ufs_qcom_cfg_timers(hba, attr->gear_rx, attr->pwr_rx,
-                                 attr->hs_rate, false, true);
+       ret = ufs_qcom_cfg_timers(hba, true);
        if (ret) {
                dev_err(hba->dev, "%s ufs cfg timer failed\n", __func__);
                return ret;