diff options
| author | Dmitry Voytik <voytikd@gmail.com> | 2014-11-06 13:49:32 -0500 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2014-11-21 18:39:36 -0500 |
| commit | c400f7a26fa0fa8ea7268cef27f1ba980df54267 (patch) | |
| tree | 491282c9f6afea178a7539302c2011260833649b | |
| parent | d2a10a1727b3948019128e83162f22c65859f1fd (diff) | |
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>
| -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) | |||
| 69 | { | 69 | { |
| 70 | struct clk_pllv3 *pll = to_clk_pllv3(hw); | 70 | struct clk_pllv3 *pll = to_clk_pllv3(hw); |
| 71 | u32 val; | 71 | u32 val; |
| 72 | int ret; | ||
| 73 | 72 | ||
| 74 | val = readl_relaxed(pll->base); | 73 | val = readl_relaxed(pll->base); |
| 75 | if (pll->powerup_set) | 74 | if (pll->powerup_set) |
| @@ -78,11 +77,7 @@ static int clk_pllv3_prepare(struct clk_hw *hw) | |||
| 78 | val &= ~BM_PLL_POWER; | 77 | val &= ~BM_PLL_POWER; |
| 79 | writel_relaxed(val, pll->base); | 78 | writel_relaxed(val, pll->base); |
| 80 | 79 | ||
| 81 | ret = clk_pllv3_wait_lock(pll); | 80 | return clk_pllv3_wait_lock(pll); |
| 82 | if (ret) | ||
| 83 | return ret; | ||
| 84 | |||
| 85 | return 0; | ||
| 86 | } | 81 | } |
| 87 | 82 | ||
| 88 | static void clk_pllv3_unprepare(struct clk_hw *hw) | 83 | static void clk_pllv3_unprepare(struct clk_hw *hw) |
