Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / scsi / ufs / ufs-qcom.c

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index de9d3f5..ea72194 100644 (file)
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -580,104 +580,6 @@ static int ufs_qcom_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
        return 0;
 }
 
-struct ufs_qcom_dev_params {
-       u32 pwm_rx_gear;        /* pwm rx gear to work in */
-       u32 pwm_tx_gear;        /* pwm tx gear to work in */
-       u32 hs_rx_gear;         /* hs rx gear to work in */
-       u32 hs_tx_gear;         /* hs tx gear to work in */
-       u32 rx_lanes;           /* number of rx lanes */
-       u32 tx_lanes;           /* number of tx lanes */
-       u32 rx_pwr_pwm;         /* rx pwm working pwr */
-       u32 tx_pwr_pwm;         /* tx pwm working pwr */
-       u32 rx_pwr_hs;          /* rx hs working pwr */
-       u32 tx_pwr_hs;          /* tx hs working pwr */
-       u32 hs_rate;            /* rate A/B to work in HS */
-       u32 desired_working_mode;
-};
-
-static int ufs_qcom_get_pwr_dev_param(struct ufs_qcom_dev_params *qcom_param,
-                                     struct ufs_pa_layer_attr *dev_max,
-                                     struct ufs_pa_layer_attr *agreed_pwr)
-{
-       int min_qcom_gear;
-       int min_dev_gear;
-       bool is_dev_sup_hs = false;
-       bool is_qcom_max_hs = false;
-
-       if (dev_max->pwr_rx == FAST_MODE)
-               is_dev_sup_hs = true;
-
-       if (qcom_param->desired_working_mode == FAST) {
-               is_qcom_max_hs = true;
-               min_qcom_gear = min_t(u32, qcom_param->hs_rx_gear,
-                                     qcom_param->hs_tx_gear);
-       } else {
-               min_qcom_gear = min_t(u32, qcom_param->pwm_rx_gear,
-                                     qcom_param->pwm_tx_gear);
-       }
-
-       /*
-        * device doesn't support HS but qcom_param->desired_working_mode is
-        * HS, thus device and qcom_param don't agree
-        */
-       if (!is_dev_sup_hs && is_qcom_max_hs) {
-               pr_err("%s: failed to agree on power mode (device doesn't support HS but requested power is HS)\n",
-                       __func__);
-               return -ENOTSUPP;
-       } else if (is_dev_sup_hs && is_qcom_max_hs) {
-               /*
-                * since device supports HS, it supports FAST_MODE.
-                * since qcom_param->desired_working_mode is also HS
-                * then final decision (FAST/FASTAUTO) is done according
-                * to qcom_params as it is the restricting factor
-                */
-               agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
-                                               qcom_param->rx_pwr_hs;
-       } else {
-               /*
-                * here qcom_param->desired_working_mode is PWM.
-                * it doesn't matter whether device supports HS or PWM,
-                * in both cases qcom_param->desired_working_mode will
-                * determine the mode
-                */
-                agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
-                                               qcom_param->rx_pwr_pwm;
-       }
-
-       /*
-        * we would like tx to work in the minimum number of lanes
-        * between device capability and vendor preferences.
-        * the same decision will be made for rx
-        */
-       agreed_pwr->lane_tx = min_t(u32, dev_max->lane_tx,
-                                               qcom_param->tx_lanes);
-       agreed_pwr->lane_rx = min_t(u32, dev_max->lane_rx,
-                                               qcom_param->rx_lanes);
-
-       /* device maximum gear is the minimum between device rx and tx gears */
-       min_dev_gear = min_t(u32, dev_max->gear_rx, dev_max->gear_tx);
-
-       /*
-        * if both device capabilities and vendor pre-defined preferences are
-        * both HS or both PWM then set the minimum gear to be the chosen
-        * working gear.
-        * if one is PWM and one is HS then the one that is PWM get to decide
-        * what is the gear, as it is the one that also decided previously what
-        * pwr the device will be configured to.
-        */
-       if ((is_dev_sup_hs && is_qcom_max_hs) ||
-           (!is_dev_sup_hs && !is_qcom_max_hs))
-               agreed_pwr->gear_rx = agreed_pwr->gear_tx =
-                       min_t(u32, min_dev_gear, min_qcom_gear);
-       else if (!is_dev_sup_hs)
-               agreed_pwr->gear_rx = agreed_pwr->gear_tx = min_dev_gear;
-       else
-               agreed_pwr->gear_rx = agreed_pwr->gear_tx = min_qcom_gear;
-
-       agreed_pwr->hs_rate = qcom_param->hs_rate;
-       return 0;
-}
-
 #ifdef CONFIG_MSM_BUS_SCALING
 static int ufs_qcom_get_bus_vote(struct ufs_qcom_host *host,
                const char *speed_mode)
@@ -905,7 +807,7 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
 {
        u32 val;
        struct ufs_qcom_host *host = ufshcd_get_variant(hba);
-       struct ufs_qcom_dev_params ufs_qcom_cap;
+       struct ufs_dev_params ufs_qcom_cap;
        int ret = 0;
 
        if (!dev_req_params) {
@@ -944,9 +846,9 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
                                ufs_qcom_cap.hs_rx_gear = UFS_HS_G2;
                }
 
-               ret = ufs_qcom_get_pwr_dev_param(&ufs_qcom_cap,
-                                                dev_max_params,
-                                                dev_req_params);
+               ret = ufshcd_get_pwr_dev_param(&ufs_qcom_cap,
+                                              dev_max_params,
+                                              dev_req_params);
                if (ret) {
                        pr_err("%s: failed to determine capabilities\n",
                                        __func__);