Messages in this thread | | | Date | Thu, 5 Jan 2017 08:07:37 +0000 | From | Lee Jones <> | Subject | Re: [PATCH 1/3] mfd: arizona: Remove duplicate set of ret variable |
| |
On Wed, 04 Jan 2017, Charles Keepax wrote:
> 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> > --- > drivers/mfd/arizona-core.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-)
For my own reference: Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index b6d4bc6..e00f577 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);
-- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
| |