mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 10:04:12 +08:00
clk: Consolidate recalc rate logic
The same if-else statement exists four times to recalculate the rate of a clock. Consolidate this logic into a single function to save some lines. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
parent
86a612349f
commit
8f2c2db132
@ -1115,6 +1115,13 @@ long clk_get_accuracy(struct clk *clk)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(clk_get_accuracy);
|
||||
|
||||
static unsigned long clk_recalc(struct clk *clk, unsigned long parent_rate)
|
||||
{
|
||||
if (clk->ops->recalc_rate)
|
||||
return clk->ops->recalc_rate(clk->hw, parent_rate);
|
||||
return parent_rate;
|
||||
}
|
||||
|
||||
/**
|
||||
* __clk_recalc_rates
|
||||
* @clk: first clk in the subtree
|
||||
@ -1140,10 +1147,7 @@ static void __clk_recalc_rates(struct clk *clk, unsigned long msg)
|
||||
if (clk->parent)
|
||||
parent_rate = clk->parent->rate;
|
||||
|
||||
if (clk->ops->recalc_rate)
|
||||
clk->rate = clk->ops->recalc_rate(clk->hw, parent_rate);
|
||||
else
|
||||
clk->rate = parent_rate;
|
||||
clk->rate = clk_recalc(clk, parent_rate);
|
||||
|
||||
/*
|
||||
* ignore NOTIFY_STOP and NOTIFY_BAD return values for POST_RATE_CHANGE
|
||||
@ -1334,10 +1338,7 @@ static int __clk_speculate_rates(struct clk *clk, unsigned long parent_rate)
|
||||
unsigned long new_rate;
|
||||
int ret = NOTIFY_DONE;
|
||||
|
||||
if (clk->ops->recalc_rate)
|
||||
new_rate = clk->ops->recalc_rate(clk->hw, parent_rate);
|
||||
else
|
||||
new_rate = parent_rate;
|
||||
new_rate = clk_recalc(clk, parent_rate);
|
||||
|
||||
/* abort rate change if a driver returns NOTIFY_BAD or NOTIFY_STOP */
|
||||
if (clk->notifier_count)
|
||||
@ -1373,10 +1374,7 @@ static void clk_calc_subtree(struct clk *clk, unsigned long new_rate,
|
||||
new_parent->new_child = clk;
|
||||
|
||||
hlist_for_each_entry(child, &clk->children, child_node) {
|
||||
if (child->ops->recalc_rate)
|
||||
child->new_rate = child->ops->recalc_rate(child->hw, new_rate);
|
||||
else
|
||||
child->new_rate = new_rate;
|
||||
child->new_rate = clk_recalc(child, new_rate);
|
||||
clk_calc_subtree(child, child->new_rate, NULL, 0);
|
||||
}
|
||||
}
|
||||
@ -1524,10 +1522,7 @@ static void clk_change_rate(struct clk *clk)
|
||||
if (!skip_set_rate && clk->ops->set_rate)
|
||||
clk->ops->set_rate(clk->hw, clk->new_rate, best_parent_rate);
|
||||
|
||||
if (clk->ops->recalc_rate)
|
||||
clk->rate = clk->ops->recalc_rate(clk->hw, best_parent_rate);
|
||||
else
|
||||
clk->rate = best_parent_rate;
|
||||
clk->rate = clk_recalc(clk, best_parent_rate);
|
||||
|
||||
if (clk->notifier_count && old_rate != clk->rate)
|
||||
__clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate);
|
||||
|
Loading…
Reference in New Issue
Block a user