diff options
| author |   Dmitry Voytik <voytikd@gmail.com> | 2014-11-06 22:49:32 +0400 |
|---|---|---|
| committer |   Shawn Guo <shawn.guo@linaro.org> | 2014-11-22 07:39:36 +0800 |
| commit | c400f7a26fa0fa8ea7268cef27f1ba980df54267 (patch) | |
| tree | 491282c9f6afea178a7539302c2011260833649b /arch/arm/mach-imx/clk-pllv3.c | |
| parent | ARM: imx6q: drop unnecessary semicolon (diff) | |
| download | linux-dev-c400f7a26fa0fa8ea7268cef27f1ba980df54267.tar.xz linux-dev-c400f7a26fa0fa8ea7268cef27f1ba980df54267.zip | |
ARM: imx: simplify clk_pllv3_prepare()
ret variable is redundant. Call clk_pllv3_wait_lock() in the end
return.
Signed-off-by: Dmitry Voytik <voytikd@gmail.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/clk-pllv3.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-pllv3.c | 7 |
1 files changed, 1 insertions, 6 deletions
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) |