summaryrefslogtreecommitdiffstats
path: root/drivers/sh/clk
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-15 10:14:43 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-11-15 10:25:12 +0100
commit9a1683d1dd14d6ed35d2884c6b79ff12fc6bef39 (patch)
tree6345115c913581a82a042cf0dc87bb7b2ad31d7d /drivers/sh/clk
parentsh: clkfwk: fix up compiler warnings. (diff)
downloadlinux-9a1683d1dd14d6ed35d2884c6b79ff12fc6bef39.tar.xz
linux-9a1683d1dd14d6ed35d2884c6b79ff12fc6bef39.zip
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);
int clk_set_rate(struct clk *clk, unsigned long rate)
{
- return clk_set_rate_ex(clk, rate, 0);
-}
-EXPORT_SYMBOL_GPL(clk_set_rate);
-
-int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
-{
int ret = -EOPNOTSUPP;
unsigned long flags;
spin_lock_irqsave(&clock_lock, flags);
if (likely(clk->ops && clk->ops->set_rate)) {
- ret = clk->ops->set_rate(clk, rate, algo_id);
+ ret = clk->ops->set_rate(clk, rate, 0);
if (ret != 0)
goto out_unlock;
} else {
@@ -485,7 +479,7 @@ out_unlock:
return ret;
}
-EXPORT_SYMBOL_GPL(clk_set_rate_ex);
+EXPORT_SYMBOL_GPL(clk_set_rate);
int clk_set_parent(struct clk *clk, struct clk *parent)
{
@@ -654,7 +648,7 @@ static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state)
clkp->parent);
if (likely(clkp->ops->set_rate))
clkp->ops->set_rate(clkp,
- rate, NO_CHANGE);
+ rate, 0);
else if (likely(clkp->ops->recalc))
clkp->rate = clkp->ops->recalc(clkp);
}