From: Dmitry Voytik Date: Thu, 6 Nov 2014 18:49:32 +0000 (+0400) Subject: ARM: imx: simplify clk_pllv3_prepare() X-Git-Tag: firefly_0821_release~176^2~2769^2~6^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c400f7a26fa0fa8ea7268cef27f1ba980df54267;p=firefly-linux-kernel-4.4.55.git ARM: imx: simplify clk_pllv3_prepare() ret variable is redundant. Call clk_pllv3_wait_lock() in the end return. Signed-off-by: Dmitry Voytik Signed-off-by: Shawn Guo --- diff --git a/arch/arm/mach-imx/clk-pllv3.c b/arch/arm/mach-imx/clk-pllv3.c index 57de74da0acf..0ad6e5442fd8 100644 --- a/arch/arm/mach-imx/clk-pllv3.c +++ b/arch/arm/mach-imx/clk-pllv3.c @@ -69,7 +69,6 @@ static int clk_pllv3_prepare(struct clk_hw *hw) { struct clk_pllv3 *pll = to_clk_pllv3(hw); u32 val; - int ret; val = readl_relaxed(pll->base); if (pll->powerup_set) @@ -78,11 +77,7 @@ static int clk_pllv3_prepare(struct clk_hw *hw) val &= ~BM_PLL_POWER; writel_relaxed(val, pll->base); - ret = clk_pllv3_wait_lock(pll); - if (ret) - return ret; - - return 0; + return clk_pllv3_wait_lock(pll); } static void clk_pllv3_unprepare(struct clk_hw *hw)