diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-02-23 00:09:26 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-02-24 14:29:43 -0500 |
commit | 51c19541624f5588bccb9d4fb3ae518c68c8082e (patch) | |
tree | 60f7b3df59806eea7ff7bbf691bb69f8791d5cc1 /arch/arm/mach-omap1/clock.c | |
parent | 8c34974ab0ecbbcdabd343f8cd0013cd2d2b0fa8 (diff) |
OMAP clock: drop RATE_FIXED clock flag
The RATE_FIXED clock flag is pointless. In the OMAP1 clock code, it
simply causes the omap1_clk_round_rate() function to return the
current rate of the clock. omap1_clk_round_rate(), however, should
never be called for a fixed-rate clock, since none of these clocks
have a .round_rate function pointer set in their struct clk records.
Similarly, in the OMAP2+ clock code, the RATE_FIXED flag just causes
the clock code to emit a warning if the OMAP clock maintainer was
foolish enough to add a .round_rate function pointer to a fixed-rate
clock. "Doctor, it hurts when I pretend that a fixed-rate clock is
rate-changeable." "Then don't pretend that a fixed-rate clock is
rate-changeable." It has no functional value. This patch drops the
RATE_FIXED clock flag, removing it from all clocks that are so marked.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Richard Woodruff <r-woodruff2@ti.com>
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
-rw-r--r-- | arch/arm/mach-omap1/clock.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 3e052f6532b1..0ba044d80a41 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/arm/mach-omap1/clock.c | 2 | * linux/arch/arm/mach-omap1/clock.c |
3 | * | 3 | * |
4 | * Copyright (C) 2004 - 2005, 2009 Nokia corporation | 4 | * Copyright (C) 2004 - 2005, 2009-2010 Nokia Corporation |
5 | * Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com> | 5 | * Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com> |
6 | * | 6 | * |
7 | * Modified to use omap shared clock framework by | 7 | * Modified to use omap shared clock framework by |
@@ -571,9 +571,6 @@ const struct clkops clkops_uart = { | |||
571 | 571 | ||
572 | long omap1_clk_round_rate(struct clk *clk, unsigned long rate) | 572 | long omap1_clk_round_rate(struct clk *clk, unsigned long rate) |
573 | { | 573 | { |
574 | if (clk->flags & RATE_FIXED) | ||
575 | return clk->rate; | ||
576 | |||
577 | if (clk->round_rate != NULL) | 574 | if (clk->round_rate != NULL) |
578 | return clk->round_rate(clk, rate); | 575 | return clk->round_rate(clk, rate); |
579 | 576 | ||