Messages in this thread Patch in this message | | | From | Dong Aisheng <> | Subject | [PATCH RFC v1 1/5] clk: change clk_core name of __clk_set_parent_after | Date | Wed, 15 Apr 2015 22:26:35 +0800 |
| |
To align with __clk_set_parent_before and some others functions, change the host clk name to 'clk' instead of 'core'.
Cc: Mike Turquette <mturquette@linaro.org> Cc: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com> --- drivers/clk/clk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 459ce9d..cc56ba2 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1487,7 +1487,7 @@ static struct clk_core *__clk_set_parent_before(struct clk_core *clk, return old_parent; } -static void __clk_set_parent_after(struct clk_core *core, +static void __clk_set_parent_after(struct clk_core *clk, struct clk_core *parent, struct clk_core *old_parent) { @@ -1495,8 +1495,8 @@ static void __clk_set_parent_after(struct clk_core *core, * Finish the migration of prepare state and undo the changes done * for preventing a race with clk_enable(). */ - if (core->prepare_count) { - clk_core_disable(core); + if (clk->prepare_count) { + clk_core_disable(clk); clk_core_disable(old_parent); clk_core_unprepare(old_parent); } -- 1.9.1
| |