p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clk: simplify __clk_init_parent() 

The translation from the index into clk_core is done by
clk_core_get_parent_by_index().  The if-block for num_parents == 1
case is duplicating the code in the clk_core_get_parent_by_index().

Drop the "if (num_parents == 1)" from the special case.  Instead,
set the index to zero if .get_parent() is missing.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Masahiro Yamada 2015-12-28 19:23:04 +09:00 committed by Stephen Boyd
parent 3c8e77dd20
commit 5146e0b059
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/clk/clk.c
View File

@ -1669,44 +1669,14 @@ struct clk *clk_get_parent(struct clk *clk)
}
EXPORT_SYMBOL_GPL(clk_get_parent);
/*
* .get_parent is mandatory for clocks with multiple possible parents. It is
* optional for single-parent clocks. Always call .get_parent if it is
* available and WARN if it is missing for multi-parent clocks.
*
* For single-parent clocks without .get_parent, first check to see if the
* .parents array exists, and if so use it to avoid an expensive tree
* traversal. If .parents does not exist then walk the tree.
*/
static struct clk_core *__clk_init_parent(struct clk_core *core)
{
struct clk_core *ret = NULL;
u8 index;
u8 index = 0;
/* handle the trivial cases */
if (core->ops->get_parent)
index = core->ops->get_parent(core->hw);
if (!core->num_parents)
goto out;
if (core->num_parents == 1) {
if (IS_ERR_OR_NULL(core->parent))
core->parent = clk_core_lookup(core->parent_names[0]);
ret = core->parent;
goto out;
}
/*
* Do our best to cache parent clocks in core->parents. This prevents
* unnecessary and expensive lookups. We don't set core->parent here;
* that is done by the calling function.
*/
index = core->ops->get_parent(core->hw);
ret = clk_core_get_parent_by_index(core, index);
out:
return ret;
return clk_core_get_parent_by_index(core, index);
}
static void clk_core_reparent(struct clk_core *core,