Browse Source

usb: phy: phy-msm-usb: Rename regulator_set_optimum_mode

The function regulator_set_optimum_mode() is changing name to
regulator_set_load(), so update the code accordingly.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Bjorn Andersson 10 years ago
parent
commit
fa53e351e8
1 changed files with 5 additions and 10 deletions
  1. 5 10
      drivers/usb/phy/phy-msm-usb.c

+ 5 - 10
drivers/usb/phy/phy-msm-usb.c

@@ -142,27 +142,22 @@ static int msm_hsusb_ldo_set_mode(struct msm_otg *motg, int on)
 	int ret = 0;
 	int ret = 0;
 
 
 	if (on) {
 	if (on) {
-		ret = regulator_set_optimum_mode(motg->v1p8,
-				USB_PHY_1P8_HPM_LOAD);
+		ret = regulator_set_load(motg->v1p8, USB_PHY_1P8_HPM_LOAD);
 		if (ret < 0) {
 		if (ret < 0) {
 			pr_err("Could not set HPM for v1p8\n");
 			pr_err("Could not set HPM for v1p8\n");
 			return ret;
 			return ret;
 		}
 		}
-		ret = regulator_set_optimum_mode(motg->v3p3,
-				USB_PHY_3P3_HPM_LOAD);
+		ret = regulator_set_load(motg->v3p3, USB_PHY_3P3_HPM_LOAD);
 		if (ret < 0) {
 		if (ret < 0) {
 			pr_err("Could not set HPM for v3p3\n");
 			pr_err("Could not set HPM for v3p3\n");
-			regulator_set_optimum_mode(motg->v1p8,
-				USB_PHY_1P8_LPM_LOAD);
+			regulator_set_load(motg->v1p8, USB_PHY_1P8_LPM_LOAD);
 			return ret;
 			return ret;
 		}
 		}
 	} else {
 	} else {
-		ret = regulator_set_optimum_mode(motg->v1p8,
-				USB_PHY_1P8_LPM_LOAD);
+		ret = regulator_set_load(motg->v1p8, USB_PHY_1P8_LPM_LOAD);
 		if (ret < 0)
 		if (ret < 0)
 			pr_err("Could not set LPM for v1p8\n");
 			pr_err("Could not set LPM for v1p8\n");
-		ret = regulator_set_optimum_mode(motg->v3p3,
-				USB_PHY_3P3_LPM_LOAD);
+		ret = regulator_set_load(motg->v3p3, USB_PHY_3P3_LPM_LOAD);
 		if (ret < 0)
 		if (ret < 0)
 			pr_err("Could not set LPM for v3p3\n");
 			pr_err("Could not set LPM for v3p3\n");
 	}
 	}