aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@sonymobile.com>2015-02-11 22:35:30 -0500
committerMark Brown <broonie@kernel.org>2015-03-09 14:33:01 -0400
commitfa53e351e81259644717b381e095eaf9173c9ca8 (patch)
tree477f5298dd36fe23265c08cd46c259fd0e4a72d8
parent1d61a6948121d73e897df0f96a0fd8aa3b3b1ac9 (diff)
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>
-rw-r--r--drivers/usb/phy/phy-msm-usb.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 000fd892455f..6ed67ea4ef7e 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -142,27 +142,22 @@ static int msm_hsusb_ldo_set_mode(struct msm_otg *motg, int on)
142 int ret = 0; 142 int ret = 0;
143 143
144 if (on) { 144 if (on) {
145 ret = regulator_set_optimum_mode(motg->v1p8, 145 ret = regulator_set_load(motg->v1p8, USB_PHY_1P8_HPM_LOAD);
146 USB_PHY_1P8_HPM_LOAD);
147 if (ret < 0) { 146 if (ret < 0) {
148 pr_err("Could not set HPM for v1p8\n"); 147 pr_err("Could not set HPM for v1p8\n");
149 return ret; 148 return ret;
150 } 149 }
151 ret = regulator_set_optimum_mode(motg->v3p3, 150 ret = regulator_set_load(motg->v3p3, USB_PHY_3P3_HPM_LOAD);
152 USB_PHY_3P3_HPM_LOAD);
153 if (ret < 0) { 151 if (ret < 0) {
154 pr_err("Could not set HPM for v3p3\n"); 152 pr_err("Could not set HPM for v3p3\n");
155 regulator_set_optimum_mode(motg->v1p8, 153 regulator_set_load(motg->v1p8, USB_PHY_1P8_LPM_LOAD);
156 USB_PHY_1P8_LPM_LOAD);
157 return ret; 154 return ret;
158 } 155 }
159 } else { 156 } else {
160 ret = regulator_set_optimum_mode(motg->v1p8, 157 ret = regulator_set_load(motg->v1p8, USB_PHY_1P8_LPM_LOAD);
161 USB_PHY_1P8_LPM_LOAD);
162 if (ret < 0) 158 if (ret < 0)
163 pr_err("Could not set LPM for v1p8\n"); 159 pr_err("Could not set LPM for v1p8\n");
164 ret = regulator_set_optimum_mode(motg->v3p3, 160 ret = regulator_set_load(motg->v3p3, USB_PHY_3P3_LPM_LOAD);
165 USB_PHY_3P3_LPM_LOAD);
166 if (ret < 0) 161 if (ret < 0)
167 pr_err("Could not set LPM for v3p3\n"); 162 pr_err("Could not set LPM for v3p3\n");
168 } 163 }