[ARM] omap: arrange for clock recalc methods to return the rate

linux-omap source commit 33d000c99ee393fe2042f93e8422f94976d276ce
introduces a way to "dry run" clock changes before they're committed.
However, this involves putting logic to handle this into each and
every recalc function, and unfortunately due to the caching, led to
some bugs.

Solve both of issues by making the recalc methods always return the
clock rate for the clock, which the caller decides what to do with.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 6 insertions, 9 deletions

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 9833d73511a1..08baa18497b2 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -126,7 +126,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
                 ret = arch_clock->clk_set_rate(clk, rate);
         if (ret == 0) {
                 if (clk->recalc)
-                        clk->recalc(clk);
+                        clk->rate = clk->recalc(clk);
                 propagate_rate(clk);
         }
         spin_unlock_irqrestore(&clockfw_lock, flags);
@@ -148,7 +148,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
                 ret = arch_clock->clk_set_parent(clk, parent);
         if (ret == 0) {
                 if (clk->recalc)
-                        clk->recalc(clk);
+                        clk->rate = clk->recalc(clk);
                 propagate_rate(clk);
         }
         spin_unlock_irqrestore(&clockfw_lock, flags);
@@ -188,12 +188,9 @@ static int __init omap_clk_setup(char *str)
 __setup("mpurate=", omap_clk_setup);
 
 /* Used for clocks that always have same value as the parent clock */
-void followparent_recalc(struct clk *clk)
+unsigned long followparent_recalc(struct clk *clk)
 {
-        if (clk == NULL || IS_ERR(clk))
-                return;
-
-        clk->rate = clk->parent->rate;
+        return clk->parent->rate;
 }
 
 void clk_reparent(struct clk *child, struct clk *parent)
@@ -214,7 +211,7 @@ void propagate_rate(struct clk * tclk)
 
         list_for_each_entry(clkp, &tclk->children, sibling) {
                 if (clkp->recalc)
-                        clkp->recalc(clkp);
+                        clkp->rate = clkp->recalc(clkp);
                 propagate_rate(clkp);
         }
 }
@@ -234,7 +231,7 @@ void recalculate_root_clocks(void)
 
         list_for_each_entry(clkp, &root_clks, sibling) {
                 if (clkp->recalc)
-                        clkp->recalc(clkp);
+                        clkp->rate = clkp->recalc(clkp);
                 propagate_rate(clkp);
         }
 }