From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Mon, 28 Dec 2015 10:23:10 +0000 (+0900)
Subject: clk: slightly optimize clk_core_set_parent()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e8f0e68ec0802dc840e29e0fabdcfdc39aa2a8fb;p=linux-beck.git

clk: slightly optimize clk_core_set_parent()

If clk_fetch_parent_index() fails, p_rate is unused.  Move the
assignment after the error checking.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 82b79a6ec0ec..d31ed95d27a4 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1748,13 +1748,13 @@ static int clk_core_set_parent(struct clk_core *core, struct clk_core *parent)
 	/* try finding the new parent index */
 	if (parent) {
 		p_index = clk_fetch_parent_index(core, parent);
-		p_rate = parent->rate;
 		if (p_index < 0) {
 			pr_debug("%s: clk %s can not be parent of clk %s\n",
 					__func__, parent->name, core->name);
 			ret = p_index;
 			goto out;
 		}
+		p_rate = parent->rate;
 	}
 
 	/* propagate PRE_RATE_CHANGE notifications */