ARM: OMAP: Convert __clk_get_rate() to provider/consumer APIs

We're removing struct clk from the clk provider API, so switch to
clk_get_rate() and clk_hw_get_rate() here appropriately.

Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/arch/arm/mach-omap2/clkt34xx_dpll3m2.c b/arch/arm/mach-omap2/clkt34xx_dpll3m2.c
index 07e1956a26ce9c9a920085a293c62f3858642138..3f6521313c93337a791963003339218d9adf3f10 100644 (file)
--- a/arch/arm/mach-omap2/clkt34xx_dpll3m2.c
+++ b/arch/arm/mach-omap2/clkt34xx_dpll3m2.c
@@ -67,8 +67,8 @@ int omap3_core_dpll_m2_set_rate(struct clk_hw *hw, unsigned long rate,
        if (validrate != rate)
                return -EINVAL;
 
-       sdrcrate = __clk_get_rate(sdrc_ick_p);
-       clkrate = __clk_get_rate(hw->clk);
+       sdrcrate = clk_get_rate(sdrc_ick_p);
+       clkrate = clk_hw_get_rate(hw);
        if (rate > clkrate)
                sdrcrate <<= ((rate / clkrate) >> 1);
        else
@@ -86,7 +86,7 @@ int omap3_core_dpll_m2_set_rate(struct clk_hw *hw, unsigned long rate,
        /*
         * XXX This only needs to be done when the CPU frequency changes
         */
-       _mpurate = __clk_get_rate(arm_fck_p) / CYCLES_PER_MHZ;
+       _mpurate = clk_get_rate(arm_fck_p) / CYCLES_PER_MHZ;
        c = (_mpurate << SDRC_MPURATE_SCALE) >> SDRC_MPURATE_BASE_SHIFT;
        c += 1;  /* for safety */
        c *= SDRC_MPURATE_LOOPS;