msm: clock: Route clk_set_rate() to clk_set_min_rate() if CLKFLAG_MIN set
Use of the proprietary clk_set_min_rate() API is being phased out globally
in favor of the standard clk_set_rate() API. Use CLKFLAG_MIN to alter the
meaning of clk_set_rate() to match that of clk_set_min_rate(). This
provides an easy migration path for drivers currently using
clk_set_min_rate().
Change-Id: I9eddc53443437250ce2812a3646e9ffb8b36852f
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-debug.c b/arch/arm/mach-msm/clock-debug.c
index 78586a8..4990c81 100644
--- a/arch/arm/mach-msm/clock-debug.c
+++ b/arch/arm/mach-msm/clock-debug.c
@@ -33,13 +33,10 @@
* for debugging purposes so we don't check for error. */
if (clock->flags & CLKFLAG_MAX)
clk_set_max_rate(clock, val);
- if (clock->flags & CLKFLAG_MIN)
- ret = clk_set_min_rate(clock, val);
- else
- ret = clk_set_rate(clock, val);
- if (ret != 0)
- printk(KERN_ERR "clk_set%s_rate failed (%d)\n",
- (clock->flags & CLKFLAG_MIN) ? "_min" : "", ret);
+ ret = clk_set_rate(clock, val);
+ if (ret)
+ pr_err("clk_set_rate failed (%d)\n", ret);
+
return ret;
}
diff --git a/arch/arm/mach-msm/clock-voter.c b/arch/arm/mach-msm/clock-voter.c
index 56beca1..2624f6c 100644
--- a/arch/arm/mach-msm/clock-voter.c
+++ b/arch/arm/mach-msm/clock-voter.c
@@ -61,7 +61,7 @@
new_rate = max(other_rate, rate);
if (new_rate != cur_rate) {
- ret = clk_set_min_rate(parent, new_rate);
+ ret = clk_set_rate(parent, new_rate);
if (ret)
goto unlock;
}
@@ -90,7 +90,7 @@
*/
cur_rate = voter_clk_aggregate_rate(parent);
if (v->rate > cur_rate) {
- ret = clk_set_min_rate(parent, v->rate);
+ ret = clk_set_rate(parent, v->rate);
if (ret)
goto out;
}
@@ -119,7 +119,7 @@
cur_rate = max(new_rate, v->rate);
if (new_rate < cur_rate)
- clk_set_min_rate(parent, new_rate);
+ clk_set_rate(parent, new_rate);
spin_unlock_irqrestore(&voter_clk_lock, flags);
}
diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
index eff85f0..d4f3e45 100644
--- a/arch/arm/mach-msm/clock.c
+++ b/arch/arm/mach-msm/clock.c
@@ -277,7 +277,10 @@
int clk_set_rate(struct clk *clk, unsigned long rate)
{
- return _clk_set_rate(clk, rate, clk->ops->set_rate);
+ if (clk->flags & CLKFLAG_MIN)
+ return _clk_set_rate(clk, rate, clk->ops->set_min_rate);
+ else
+ return _clk_set_rate(clk, rate, clk->ops->set_rate);
}
EXPORT_SYMBOL(clk_set_rate);