Commit c660b2eb authored Jul 28, 2015 by Dong Aisheng Committed by Michael Turquette Aug 24, 2015

clk: remove duplicated code with __clk_set_parent_after



__clk_set_parent_after() actually used the second argument then we
could put this duplicate logic in there and call it with a different
order of arguments in the success vs. error paths in this function.

Cc: Mike Turquette <mturquette@linaro.org>
Suggested-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

parent 836ee0f7

drivers/clk/clk.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -1208,14 +1208,8 @@ static int __clk_set_parent(struct clk_core core, struct clk_core parent,
		flags = clk_enable_lock();
		clk_reparent(core, old_parent);
		clk_enable_unlock(flags);
		__clk_set_parent_after(core, old_parent, parent);

		if (core->prepare_count) {
		flags = clk_enable_lock();
		clk_core_disable(core);
		clk_core_disable(parent);
		clk_enable_unlock(flags);
		clk_core_unprepare(parent);
		}
		return ret;
		}