aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/clk/core.c5
-rw-r--r--drivers/sh/clk/cpg.c5
2 files changed, 4 insertions, 6 deletions
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
113static int sh_clk_div6_set_rate(struct clk *clk, 113static 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
256static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id) 255static 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;