|
@@ -454,12 +454,6 @@ unsigned long clk_get_rate(struct clk *clk)
|
|
|
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;
|
|
@@ -467,7 +461,7 @@ int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
|
|
|
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);
|
|
|
}
|