OMAP2/3 clock: drop recalc function pointers from fixed rate clocks

Now that rate recalculation and rate propagation are two separate
operations, drop recalc function pointers from all fixed rate clocks.
Their rates are fixed, so there's no need to recalculate.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h
index 929a257e92af6433a16f4cd28b57032c2c7be8ff..30f3c578a6ac618506d1e38288a187a322542ab5 100644 (file)
--- a/arch/arm/mach-omap2/clock24xx.h
+++ b/arch/arm/mach-omap2/clock24xx.h
@@ -627,7 +627,6 @@ static struct clk func_32k_ck = {
        .flags          = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |
                                RATE_FIXED | ALWAYS_ENABLED | RATE_PROPAGATES,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 /* Typical 12/13MHz in standalone mode, will be 26Mhz in chassis mode */
@@ -657,7 +656,6 @@ static struct clk alt_ck = {                /* Typical 54M or 48M, may not exist */
        .flags          = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |
                                RATE_FIXED | ALWAYS_ENABLED | RATE_PROPAGATES,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 /*
@@ -709,7 +707,6 @@ static struct clk apll96_ck = {
        .enable_bit     = OMAP24XX_EN_96M_PLL_SHIFT,
        .enable         = &omap2_clk_fixed_enable,
        .disable        = &omap2_clk_fixed_disable,
-       .recalc         = &propagate_rate,
 };
 
 static struct clk apll54_ck = {
@@ -724,7 +721,6 @@ static struct clk apll54_ck = {
        .enable_bit     = OMAP24XX_EN_54M_PLL_SHIFT,
        .enable         = &omap2_clk_fixed_enable,
        .disable        = &omap2_clk_fixed_disable,
-       .recalc         = &propagate_rate,
 };
 
 /*

diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index 5357507c413473b1d72199fbfb9f74ee69819b21..66cbe0cdc78bd1695dcac03076c7e204c2459fec 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -67,7 +67,6 @@ static struct clk omap_32k_fck = {
        .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES |
                                ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 static struct clk secure_32k_fck = {
@@ -76,7 +75,6 @@ static struct clk secure_32k_fck = {
        .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES |
                                ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 /* Virtual source clocks for osc_sys_ck */
@@ -86,7 +84,6 @@ static struct clk virt_12m_ck = {
        .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES |
                                ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 static struct clk virt_13m_ck = {
@@ -95,7 +92,6 @@ static struct clk virt_13m_ck = {
        .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES |
                                ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 static struct clk virt_16_8m_ck = {
@@ -104,7 +100,6 @@ static struct clk virt_16_8m_ck = {
        .flags          = CLOCK_IN_OMAP3430ES2 | RATE_FIXED | RATE_PROPAGATES |
                                ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 static struct clk virt_19_2m_ck = {
@@ -113,7 +108,6 @@ static struct clk virt_19_2m_ck = {
        .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES |
                                ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 static struct clk virt_26m_ck = {
@@ -122,7 +116,6 @@ static struct clk virt_26m_ck = {
        .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES |
                                ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 static struct clk virt_38_4m_ck = {
@@ -131,7 +124,6 @@ static struct clk virt_38_4m_ck = {
        .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES |
                                ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 static const struct clksel_rate osc_sys_12m_rates[] = {
@@ -220,7 +212,6 @@ static struct clk sys_altclk = {
        .name           = "sys_altclk",
        .flags          = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,
        .clkdm          = { .name = "cm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 /*
@@ -232,7 +223,6 @@ static struct clk mcbsp_clks = {
        .name           = "mcbsp_clks",
        .flags          = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,
        .clkdm          = { .name = "prm_clkdm" },
-       .recalc         = &propagate_rate,
 };
 
 /* PRM EXTERNAL CLOCK OUTPUT */

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 9f458cbaa413e51ffd7c42a26b505b39816d673d..35064cd5a1ee1b9640e49289f8f86be4fb14f0ff 100644 (file)
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -187,7 +187,8 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
        if (arch_clock->clk_set_rate) {
                ret = arch_clock->clk_set_rate(clk, rate);
                if (ret == 0) {
-                       (*clk->recalc)(clk);
+                       if (clk->recalc)
+                               (*clk->recalc)(clk);
                        if (clk->flags & RATE_PROPAGATES)
                                propagate_rate(clk);
                }
@@ -212,7 +213,8 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
        if (arch_clock->clk_set_parent) {
                ret = arch_clock->clk_set_parent(clk, parent);
                if (ret == 0) {
-                       (*clk->recalc)(clk);
+                       if (clk->recalc)
+                               (*clk->recalc)(clk);
                        if (clk->flags & RATE_PROPAGATES)
                                propagate_rate(clk);
                }
@@ -285,11 +287,10 @@ void propagate_rate(struct clk * tclk)
        list_for_each_entry(clkp, &clocks, node) {
                if (likely(clkp->parent != tclk))
                        continue;
-               if (likely((u32)clkp->recalc)) {
+               if (clkp->recalc)
                        clkp->recalc(clkp);
-                       if (clkp->flags & RATE_PROPAGATES)
-                               propagate_rate(clkp);
-               }
+               if (clkp->flags & RATE_PROPAGATES)
+                       propagate_rate(clkp);
        }
 }
 
@@ -305,8 +306,9 @@ void recalculate_root_clocks(void)
        struct clk *clkp;
 
        list_for_each_entry(clkp, &clocks, node) {
-               if (unlikely(!clkp->parent) && likely((u32)clkp->recalc)) {
-                       clkp->recalc(clkp);
+               if (unlikely(!clkp->parent)) {
+                       if (clkp->recalc)
+                               clkp->recalc(clkp);
                        if (clkp->flags & RATE_PROPAGATES)
                                propagate_rate(clkp);
                }