From c660b2ebb25be5668a4ed333539f34b05841e17a Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Tue, 28 Jul 2015 21:19:41 +0800 Subject: [PATCH] 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 Suggested-by: Stephen Boyd Signed-off-by: Dong Aisheng Signed-off-by: Stephen Boyd --- drivers/clk/clk.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 8e6688d1ecbd..43e2c3ad6c31 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -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; } -- 2.30.2