aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
diff options
context:
space:
mode:
authorGravatar Paul Mundt <lethal@linux-sh.org> 2009-05-12 03:45:08 +0900
committerGravatar Paul Mundt <lethal@linux-sh.org> 2009-05-12 03:45:08 +0900
commitb68d8201433a91cabbcbeae48b53d8c1c426433a (patch)
treefed76b13249a01356509c0860260434216352f8c /arch/sh/kernel/cpu/sh2a/clock-sh7203.c
parentsh: TMU platform data for sh7780 (diff)
downloadlinux-b68d8201433a91cabbcbeae48b53d8c1c426433a.tar.gz
linux-b68d8201433a91cabbcbeae48b53d8c1c426433a.tar.bz2
linux-b68d8201433a91cabbcbeae48b53d8c1c426433a.zip
sh: clkfwk: Make recalc return an unsigned long.
This is prep work for cleaning up some of the rate propagation bits. Trivial conversion. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh2a/clock-sh7203.c')
-rw-r--r--arch/sh/kernel/cpu/sh2a/clock-sh7203.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
index fb781329848a..f8c6933857b3 100644
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
@@ -46,29 +46,29 @@ static struct clk_ops sh7203_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 idx = (ctrl_inw(FREQCR) & 0x0007);
- clk->rate = clk->parent->rate / pfc_divisors[idx];
+ return clk->parent->rate / pfc_divisors[idx];
}
static struct clk_ops sh7203_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 idx = (ctrl_inw(FREQCR) & 0x0007);
- clk->rate = clk->parent->rate / pfc_divisors[idx-2];
+ return clk->parent->rate / pfc_divisors[idx-2];
}
static struct clk_ops sh7203_bus_clk_ops = {
.recalc = bus_clk_recalc,
};
-static void cpu_clk_recalc(struct clk *clk)
+static unsigned long cpu_clk_recalc(struct clk *clk)
{
- clk->rate = clk->parent->rate;
+ return clk->parent->rate;
}
static struct clk_ops sh7203_cpu_clk_ops = {