aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sh/clk
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-15 04:14:43 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-11-15 04:25:12 -0500
commit9a1683d1dd14d6ed35d2884c6b79ff12fc6bef39 (patch)
tree6345115c913581a82a042cf0dc87bb7b2ad31d7d /drivers/sh/clk
parented10b490ea6498f76284043565d42ca3649ccca1 (diff)
sh: clkfwk: Kill off unused clk_set_rate_ex().
With the refactoring of the SH7722 clock framework some time ago this abstraction has become unecessary. Kill it off before anyone else gets the bright idea to start using it. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh/clk')
-rw-r--r--drivers/sh/clk/core.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c
index cb12a8e1466b..69be6bb92323 100644
--- a/drivers/sh/clk/core.c
+++ b/drivers/sh/clk/core.c
@@ -455,19 +455,13 @@ EXPORT_SYMBOL_GPL(clk_get_rate);
455 455
456int clk_set_rate(struct clk *clk, unsigned long rate) 456int clk_set_rate(struct clk *clk, unsigned long rate)
457{ 457{
458 return clk_set_rate_ex(clk, rate, 0);
459}
460EXPORT_SYMBOL_GPL(clk_set_rate);
461
462int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
463{
464 int ret = -EOPNOTSUPP; 458 int ret = -EOPNOTSUPP;
465 unsigned long flags; 459 unsigned long flags;
466 460
467 spin_lock_irqsave(&clock_lock, flags); 461 spin_lock_irqsave(&clock_lock, flags);
468 462
469 if (likely(clk->ops && clk->ops->set_rate)) { 463 if (likely(clk->ops && clk->ops->set_rate)) {
470 ret = clk->ops->set_rate(clk, rate, algo_id); 464 ret = clk->ops->set_rate(clk, rate, 0);
471 if (ret != 0) 465 if (ret != 0)
472 goto out_unlock; 466 goto out_unlock;
473 } else { 467 } else {
@@ -485,7 +479,7 @@ out_unlock:
485 479
486 return ret; 480 return ret;
487} 481}
488EXPORT_SYMBOL_GPL(clk_set_rate_ex); 482EXPORT_SYMBOL_GPL(clk_set_rate);
489 483
490int clk_set_parent(struct clk *clk, struct clk *parent) 484int clk_set_parent(struct clk *clk, struct clk *parent)
491{ 485{
@@ -654,7 +648,7 @@ static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state)
654 clkp->parent); 648 clkp->parent);
655 if (likely(clkp->ops->set_rate)) 649 if (likely(clkp->ops->set_rate))
656 clkp->ops->set_rate(clkp, 650 clkp->ops->set_rate(clkp,
657 rate, NO_CHANGE); 651 rate, 0);
658 else if (likely(clkp->ops->recalc)) 652 else if (likely(clkp->ops->recalc))
659 clkp->rate = clkp->ops->recalc(clkp); 653 clkp->rate = clkp->ops->recalc(clkp);
660 } 654 }