Browse Source

regulator: fixes for regulator_set_optimum_mode name change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
Stephen Rothwell 10 years ago
parent
commit
7e476c7dd8
2 changed files with 5 additions and 5 deletions
  1. 3 3
      drivers/gpu/drm/msm/edp/edp_ctrl.c
  2. 2 2
      drivers/phy/phy-qcom-ufs.c

+ 3 - 3
drivers/gpu/drm/msm/edp/edp_ctrl.c

@@ -332,7 +332,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl)
 		goto vdda_set_fail;
 		goto vdda_set_fail;
 	}
 	}
 
 
-	ret = regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_ON_LOAD);
+	ret = regulator_set_load(ctrl->vdda_vreg, VDDA_UA_ON_LOAD);
 	if (ret < 0) {
 	if (ret < 0) {
 		pr_err("%s: vdda_vreg set regulator mode failed.\n", __func__);
 		pr_err("%s: vdda_vreg set regulator mode failed.\n", __func__);
 		goto vdda_set_fail;
 		goto vdda_set_fail;
@@ -356,7 +356,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl)
 lvl_enable_fail:
 lvl_enable_fail:
 	regulator_disable(ctrl->vdda_vreg);
 	regulator_disable(ctrl->vdda_vreg);
 vdda_enable_fail:
 vdda_enable_fail:
-	regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
+	regulator_set_load(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
 vdda_set_fail:
 vdda_set_fail:
 	return ret;
 	return ret;
 }
 }
@@ -365,7 +365,7 @@ static void edp_regulator_disable(struct edp_ctrl *ctrl)
 {
 {
 	regulator_disable(ctrl->lvl_vreg);
 	regulator_disable(ctrl->lvl_vreg);
 	regulator_disable(ctrl->vdda_vreg);
 	regulator_disable(ctrl->vdda_vreg);
-	regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
+	regulator_set_load(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
 }
 }
 
 
 static int edp_gpio_config(struct edp_ctrl *ctrl)
 static int edp_gpio_config(struct edp_ctrl *ctrl)

+ 2 - 2
drivers/phy/phy-qcom-ufs.c

@@ -346,10 +346,10 @@ int ufs_qcom_phy_cfg_vreg(struct phy *phy,
 			goto out;
 			goto out;
 		}
 		}
 		uA_load = on ? vreg->max_uA : 0;
 		uA_load = on ? vreg->max_uA : 0;
-		ret = regulator_set_optimum_mode(reg, uA_load);
+		ret = regulator_set_load(reg, uA_load);
 		if (ret >= 0) {
 		if (ret >= 0) {
 			/*
 			/*
-			 * regulator_set_optimum_mode() returns new regulator
+			 * regulator_set_load() returns new regulator
 			 * mode upon success.
 			 * mode upon success.
 			 */
 			 */
 			ret = 0;
 			ret = 0;