Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9e88209 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: remove unnecessary calls to propagate_rate() 



We've always called propagate_rate() in the parent function to
the .set_rate methods, so there's no point having the .set_rate
methods also call this heavy-weight function - it's mere
duplication of what's happening elsewhere.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c6af4508

arch/arm/mach-omap1/clock.c

+1 −8
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ static int omap1_select_table_rate(struct clk * clk, unsigned long rate) 
		omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val);



	ck_dpll1.rate = ptr->pll_rate;

	propagate_rate(&ck_dpll1);

	return 0;

}
@@ -333,9 +332,6 @@ static int omap1_clk_set_rate_dsp_domain(struct clk *clk, unsigned long rate) 
		ret = 0;

	}



	if (unlikely(ret == 0 && (clk->flags & RATE_PROPAGATES)))

		propagate_rate(clk);



	return ret;

}
@@ -442,8 +438,6 @@ static int omap1_set_sossi_rate(struct clk *clk, unsigned long rate) 
	omap_writel(l, MOD_CONF_CTRL_1);



	clk->rate = p_rate / (div + 1);

	if (unlikely(clk->flags & RATE_PROPAGATES))

		propagate_rate(clk);



	return 0;

}
@@ -787,7 +781,6 @@ int __init omap1_clk_init(void) 
			}

		}

	}

	propagate_rate(&ck_dpll1);

#else

	/* Find the highest supported frequency and enable it */

	if (omap1_select_table_rate(&virtual_ck_mpu, ~0)) {
@@ -796,9 +789,9 @@ int __init omap1_clk_init(void) 
		omap_writew(0x2290, DPLL_CTL);

		omap_writew(cpu_is_omap730() ? 0x3005 : 0x1005, ARM_CKCTL);

		ck_dpll1.rate = 60000000;

		propagate_rate(&ck_dpll1);

	}

#endif

	propagate_rate(&ck_dpll1);

	/* Cache rates for clocks connected to ck_ref (not dpll1) */

	propagate_rate(&ck_ref);

	printk(KERN_INFO "Clocking rate (xtal/DPLL1/MPU): "