[ARM] omap: move propagate_rate() calls into generic omap clock code

propagate_rate() is recursive, so it makes sense to minimise the
amount of stack which is used for each recursion.  So, rather than
recursing back into it from the ->recalc functions if RATE_PROPAGATES
is set, do that test at the higher level.

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

1 files changed, 0 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index 335ef88ada55..dcacec84f8ca 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -58,7 +58,6 @@ static struct clk omap_32k_fck = {
         .ops            = &clkops_null,
         .rate           = 32768,
         .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 static struct clk secure_32k_fck = {
@@ -66,7 +65,6 @@ static struct clk secure_32k_fck = {
         .ops            = &clkops_null,
         .rate           = 32768,
         .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 /* Virtual source clocks for osc_sys_ck */
@@ -75,7 +73,6 @@ static struct clk virt_12m_ck = {
         .ops            = &clkops_null,
         .rate           = 12000000,
         .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 static struct clk virt_13m_ck = {
@@ -83,7 +80,6 @@ static struct clk virt_13m_ck = {
         .ops            = &clkops_null,
         .rate           = 13000000,
         .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 static struct clk virt_16_8m_ck = {
@@ -91,7 +87,6 @@ static struct clk virt_16_8m_ck = {
         .ops            = &clkops_null,
         .rate           = 16800000,
         .flags          = CLOCK_IN_OMAP3430ES2 | RATE_FIXED | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 static struct clk virt_19_2m_ck = {
@@ -99,7 +94,6 @@ static struct clk virt_19_2m_ck = {
         .ops            = &clkops_null,
         .rate           = 19200000,
         .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 static struct clk virt_26m_ck = {
@@ -107,7 +101,6 @@ static struct clk virt_26m_ck = {
         .ops            = &clkops_null,
         .rate           = 26000000,
         .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 static struct clk virt_38_4m_ck = {
@@ -115,7 +108,6 @@ static struct clk virt_38_4m_ck = {
         .ops            = &clkops_null,
         .rate           = 38400000,
         .flags          = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 static const struct clksel_rate osc_sys_12m_rates[] = {
@@ -201,7 +193,6 @@ static struct clk sys_altclk = {
         .name           = "sys_altclk",
         .ops            = &clkops_null,
         .flags          = CLOCK_IN_OMAP343X | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 /* Optional external clock input for some McBSPs */
@@ -209,7 +200,6 @@ static struct clk mcbsp_clks = {
         .name           = "mcbsp_clks",
         .ops            = &clkops_null,
         .flags          = CLOCK_IN_OMAP343X | RATE_PROPAGATES,
-        .recalc         = &propagate_rate,
 };
 
 /* PRM EXTERNAL CLOCK OUTPUT */