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

Commit 007e8363 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: clkfwk: Kill off clk_recalc_rate(). 



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: default avatarPaul Mundt <lethal@linux-sh.org>
parent f5c84cf5

arch/sh/include/asm/clock.h

+0 −1
Original line number Diff line number Diff line
@@ -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 *);

arch/sh/kernel/cpu/clock.c

+0 −14
Original line number Diff line number Diff line
@@ -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;

arch/sh/kernel/cpu/sh4a/clock-sh7722.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}