Merge Linus master into drm-next

[pandora-kernel.git] / drivers / gpu / drm / msm / dsi / dsi_host.c

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index fdc54e3..956b224 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -327,8 +327,8 @@ static void dsi_host_regulator_disable(struct msm_dsi_host *msm_host)
        DBG("");
        for (i = num - 1; i >= 0; i--)
                if (regs[i].disable_load >= 0)
-                       regulator_set_optimum_mode(s[i].consumer,
-                                               regs[i].disable_load);
+                       regulator_set_load(s[i].consumer,
+                                          regs[i].disable_load);
 
        regulator_bulk_disable(num, s);
 }
@@ -343,8 +343,8 @@ static int dsi_host_regulator_enable(struct msm_dsi_host *msm_host)
        DBG("");
        for (i = 0; i < num; i++) {
                if (regs[i].enable_load >= 0) {
-                       ret = regulator_set_optimum_mode(s[i].consumer,
-                                                       regs[i].enable_load);
+                       ret = regulator_set_load(s[i].consumer,
+                                                regs[i].enable_load);
                        if (ret < 0) {
                                pr_err("regulator %d set op mode failed, %d\n",
                                        i, ret);
@@ -363,7 +363,7 @@ static int dsi_host_regulator_enable(struct msm_dsi_host *msm_host)
 
 fail:
        for (i--; i >= 0; i--)
-               regulator_set_optimum_mode(s[i].consumer, regs[i].disable_load);
+               regulator_set_load(s[i].consumer, regs[i].disable_load);
        return ret;
 }