diff options
Diffstat (limited to 'arch/sh/kernel/cpu/sh3/clock-sh3.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh3/clock-sh3.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh3/clock-sh3.c b/arch/sh/kernel/cpu/sh3/clock-sh3.c index c3c945958ba..27b8738f0b0 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh3.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh3.c @@ -38,36 +38,36 @@ static struct clk_ops sh3_master_clk_ops = {  	.init		= master_clk_init,  }; -static void module_clk_recalc(struct clk *clk) +static unsigned long module_clk_recalc(struct clk *clk)  {  	int frqcr = ctrl_inw(FRQCR);  	int idx = ((frqcr & 0x2000) >> 11) | (frqcr & 0x0003); -	clk->rate = clk->parent->rate / pfc_divisors[idx]; +	return clk->parent->rate / pfc_divisors[idx];  }  static struct clk_ops sh3_module_clk_ops = {  	.recalc		= module_clk_recalc,  }; -static void bus_clk_recalc(struct clk *clk) +static unsigned long bus_clk_recalc(struct clk *clk)  {  	int frqcr = ctrl_inw(FRQCR);  	int idx = ((frqcr & 0x8000) >> 13) | ((frqcr & 0x0030) >> 4); -	clk->rate = clk->parent->rate / stc_multipliers[idx]; +	return clk->parent->rate / stc_multipliers[idx];  }  static struct clk_ops sh3_bus_clk_ops = {  	.recalc		= bus_clk_recalc,  }; -static void cpu_clk_recalc(struct clk *clk) +static unsigned long cpu_clk_recalc(struct clk *clk)  {  	int frqcr = ctrl_inw(FRQCR);  	int idx = ((frqcr & 0x4000) >> 12) | ((frqcr & 0x000c) >> 2); -	clk->rate = clk->parent->rate / ifc_divisors[idx]; +	return clk->parent->rate / ifc_divisors[idx];  }  static struct clk_ops sh3_cpu_clk_ops = {  |