diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2017-03-15 14:58:36 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-04-27 09:25:05 +0100 |
| commit | de4ea10ad7bd86445875bab25596016544f827ca (patch) | |
| tree | 74293f84bd7ead5b2db02e9e3a49d75242505bd7 /drivers/mfd/arizona-core.c | |
| parent | 81d30eda98fd8e29a6e002f6938cb746f75ca14f (diff) | |
| download | linux-de4ea10ad7bd86445875bab25596016544f827ca.tar.gz linux-de4ea10ad7bd86445875bab25596016544f827ca.tar.bz2 linux-de4ea10ad7bd86445875bab25596016544f827ca.zip | |
mfd: arizona: Remove duplicate set of ret variable
arizona_poll_reg already returns ETIMEDOUT if we don't see the expected
register changes before the time out, so remove pointless local setting of
ETIMEDOUT.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/arizona-core.c')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index b6d4bc63c426..e00f577db830 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -342,10 +342,8 @@ static int arizona_enable_freerun_sysclk(struct arizona *arizona, ret = arizona_poll_reg(arizona, 25, ARIZONA_INTERRUPT_RAW_STATUS_5, ARIZONA_FLL1_CLOCK_OK_STS, ARIZONA_FLL1_CLOCK_OK_STS); - if (ret) { - ret = -ETIMEDOUT; + if (ret) goto err_fll; - } ret = regmap_write(arizona->regmap, ARIZONA_SYSTEM_CLOCK_1, 0x0144); if (ret) { @@ -407,11 +405,9 @@ static int wm5102_apply_hardware_patch(struct arizona *arizona) ret = arizona_poll_reg(arizona, 5, ARIZONA_WRITE_SEQUENCER_CTRL_1, ARIZONA_WSEQ_BUSY, 0); - if (ret) { + if (ret) regmap_write(arizona->regmap, ARIZONA_WRITE_SEQUENCER_CTRL_0, ARIZONA_WSEQ_ABORT); - ret = -ETIMEDOUT; - } err: err = arizona_disable_freerun_sysclk(arizona, &state); |