Skip to content

Commit

Permalink
sh: clkfwk: Kill off clk_recalc_rate().
Browse files Browse the repository at this point in the history
The only user for this is the SH-Mobile r_clk, which is now added as a
root clock and can be kicked via propagate_rate() as usual. Given that,
there is no longer any need for the special clk_recalc_rate(), so we kill
it off.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed May 11, 2009
1 parent f5c84cf commit 007e836
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
1 change: 0 additions & 1 deletion arch/sh/include/asm/clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ unsigned long followparent_recalc(struct clk *);
void recalculate_root_clocks(void);
void propagate_rate(struct clk *);
int clk_reparent(struct clk *child, struct clk *parent);
void clk_recalc_rate(struct clk *);
int clk_register(struct clk *);
void clk_unregister(struct clk *);

Expand Down
14 changes: 0 additions & 14 deletions arch/sh/kernel/cpu/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,20 +280,6 @@ int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
}
EXPORT_SYMBOL_GPL(clk_set_rate_ex);

void clk_recalc_rate(struct clk *clk)
{
unsigned long flags;

if (!clk->ops->recalc)
return;

spin_lock_irqsave(&clock_lock, flags);
clk->rate = clk->ops->recalc(clk);
propagate_rate(clk);
spin_unlock_irqrestore(&clock_lock, flags);
}
EXPORT_SYMBOL_GPL(clk_recalc_rate);

int clk_set_parent(struct clk *clk, struct clk *parent)
{
unsigned long flags;
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/kernel/cpu/sh4a/clock-sh7722.c
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ int __init arch_clk_init(void)
clk_put(clk);
}

clk_recalc_rate(&sh7722_r_clock); /* make sure rate gets propagated */
propagate_rate(&sh7722_r_clock); /* make sure rate gets propagated */

return 0;
}

0 comments on commit 007e836

Please sign in to comment.