diff options
-rw-r--r-- | arch/arm/mach-shmobile/clock-sh7372.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 | ||||
-rw-r--r-- | drivers/sh/clk/core.c | 5 | ||||
-rw-r--r-- | drivers/sh/clk/cpg.c | 5 | ||||
-rw-r--r-- | include/linux/sh_clk.h | 2 |
5 files changed, 8 insertions, 12 deletions
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c index 7db31e6c6bf2..b25ce90a346e 100644 --- a/arch/arm/mach-shmobile/clock-sh7372.c +++ b/arch/arm/mach-shmobile/clock-sh7372.c | |||
@@ -220,8 +220,7 @@ static void pllc2_disable(struct clk *clk) | |||
220 | __raw_writel(__raw_readl(PLLC2CR) & ~0x80000000, PLLC2CR); | 220 | __raw_writel(__raw_readl(PLLC2CR) & ~0x80000000, PLLC2CR); |
221 | } | 221 | } |
222 | 222 | ||
223 | static int pllc2_set_rate(struct clk *clk, | 223 | static int pllc2_set_rate(struct clk *clk, unsigned long rate) |
224 | unsigned long rate, int algo_id) | ||
225 | { | 224 | { |
226 | unsigned long value; | 225 | unsigned long value; |
227 | int idx; | 226 | int idx; |
@@ -463,8 +462,7 @@ static int fsidiv_enable(struct clk *clk) | |||
463 | return 0; | 462 | return 0; |
464 | } | 463 | } |
465 | 464 | ||
466 | static int fsidiv_set_rate(struct clk *clk, | 465 | static int fsidiv_set_rate(struct clk *clk, unsigned long rate) |
467 | unsigned long rate, int algo_id) | ||
468 | { | 466 | { |
469 | int idx; | 467 | int idx; |
470 | 468 | ||
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c index 4eabc68cd753..b601fa3978d1 100644 --- a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c +++ b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c | |||
@@ -110,7 +110,7 @@ static int shoc_clk_verify_rate(struct clk *clk, unsigned long rate) | |||
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
113 | static int shoc_clk_set_rate(struct clk *clk, unsigned long rate, int algo_id) | 113 | static int shoc_clk_set_rate(struct clk *clk, unsigned long rate) |
114 | { | 114 | { |
115 | unsigned long frqcr3; | 115 | unsigned long frqcr3; |
116 | unsigned int tmp; | 116 | unsigned int tmp; |
diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c index 69be6bb92323..87743e7d4d42 100644 --- a/drivers/sh/clk/core.c +++ b/drivers/sh/clk/core.c | |||
@@ -461,7 +461,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate) | |||
461 | spin_lock_irqsave(&clock_lock, flags); | 461 | spin_lock_irqsave(&clock_lock, flags); |
462 | 462 | ||
463 | if (likely(clk->ops && clk->ops->set_rate)) { | 463 | if (likely(clk->ops && clk->ops->set_rate)) { |
464 | ret = clk->ops->set_rate(clk, rate, 0); | 464 | ret = clk->ops->set_rate(clk, rate); |
465 | if (ret != 0) | 465 | if (ret != 0) |
466 | goto out_unlock; | 466 | goto out_unlock; |
467 | } else { | 467 | } else { |
@@ -647,8 +647,7 @@ static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state) | |||
647 | clkp->ops->set_parent(clkp, | 647 | clkp->ops->set_parent(clkp, |
648 | clkp->parent); | 648 | clkp->parent); |
649 | if (likely(clkp->ops->set_rate)) | 649 | if (likely(clkp->ops->set_rate)) |
650 | clkp->ops->set_rate(clkp, | 650 | clkp->ops->set_rate(clkp, rate); |
651 | rate, 0); | ||
652 | else if (likely(clkp->ops->recalc)) | 651 | else if (likely(clkp->ops->recalc)) |
653 | clkp->rate = clkp->ops->recalc(clkp); | 652 | clkp->rate = clkp->ops->recalc(clkp); |
654 | } | 653 | } |
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c index 3aea5f0ceb09..359e9a322c7b 100644 --- a/drivers/sh/clk/cpg.c +++ b/drivers/sh/clk/cpg.c | |||
@@ -110,8 +110,7 @@ static int sh_clk_div6_set_parent(struct clk *clk, struct clk *parent) | |||
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
113 | static int sh_clk_div6_set_rate(struct clk *clk, | 113 | static int sh_clk_div6_set_rate(struct clk *clk, unsigned long rate) |
114 | unsigned long rate, int algo_id) | ||
115 | { | 114 | { |
116 | unsigned long value; | 115 | unsigned long value; |
117 | int idx; | 116 | int idx; |
@@ -253,7 +252,7 @@ static int sh_clk_div4_set_parent(struct clk *clk, struct clk *parent) | |||
253 | return 0; | 252 | return 0; |
254 | } | 253 | } |
255 | 254 | ||
256 | static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id) | 255 | static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate) |
257 | { | 256 | { |
258 | struct clk_div4_table *d4t = clk->priv; | 257 | struct clk_div4_table *d4t = clk->priv; |
259 | unsigned long value; | 258 | unsigned long value; |
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index 30885d928801..038475a2092f 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h | |||
@@ -23,7 +23,7 @@ struct clk_ops { | |||
23 | int (*enable)(struct clk *clk); | 23 | int (*enable)(struct clk *clk); |
24 | void (*disable)(struct clk *clk); | 24 | void (*disable)(struct clk *clk); |
25 | unsigned long (*recalc)(struct clk *clk); | 25 | unsigned long (*recalc)(struct clk *clk); |
26 | int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id); | 26 | int (*set_rate)(struct clk *clk, unsigned long rate); |
27 | int (*set_parent)(struct clk *clk, struct clk *parent); | 27 | int (*set_parent)(struct clk *clk, struct clk *parent); |
28 | long (*round_rate)(struct clk *clk, unsigned long rate); | 28 | long (*round_rate)(struct clk *clk, unsigned long rate); |
29 | }; | 29 | }; |