sh: Clock framework tidying.

This syncs up the SH clock framework with the linux/clk.h API,
for which there were only some minor changes required, namely
the clk_get() dev_id and subsequent callsites.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c
index 95581dccbbfd..a574b93a4e7b 100644
--- a/arch/sh/kernel/timers/timer-cmt.c
+++ b/arch/sh/kernel/timers/timer-cmt.c
@@ -124,7 +124,7 @@ static void cmt_clk_init(struct clk *clk)
         u8 divisor = CMT_CMCSR_INIT & 0x3;
         ctrl_inw(CMT_CMCSR_0);
         ctrl_outw(CMT_CMCSR_INIT, CMT_CMCSR_0);
-        clk->parent = clk_get("module_clk");
+        clk->parent = clk_get(NULL, "module_clk");
         clk->rate = clk->parent->rate / (8 << (divisor << 1));
 }
 
@@ -164,7 +164,7 @@ static int cmt_timer_init(void)
 
         setup_irq(CONFIG_SH_TIMER_IRQ, &cmt_irq);
 
-        cmt0_clk.parent = clk_get("module_clk");
+        cmt0_clk.parent = clk_get(NULL, "module_clk");
 
         cmt_timer_stop();
 
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index 201f0a62132f..fffcd1c09873 100644
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -161,7 +161,7 @@ static int mtu2_timer_init(void)
 
         setup_irq(CONFIG_SH_TIMER_IRQ, &mtu2_irq);
 
-        mtu2_clk1.parent = clk_get("module_clk");
+        mtu2_clk1.parent = clk_get(NULL, "module_clk");
 
         ctrl_outb(ctrl_inb(STBCR3) & (~0x20), STBCR3);
 
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index b9ed8a387555..e060e71d0785 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -144,7 +144,7 @@ static int tmu_timer_init(void)
 
         setup_irq(CONFIG_SH_TIMER_IRQ, &tmu_irq);
 
-        tmu0_clk.parent = clk_get("module_clk");
+        tmu0_clk.parent = clk_get(NULL, "module_clk");
 
         /* Start TMU0 */
         tmu_timer_stop();