Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753120AbdCNRGT (ORCPT ); Tue, 14 Mar 2017 13:06:19 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:34991 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753095AbdCNRGP (ORCPT ); Tue, 14 Mar 2017 13:06:15 -0400 Date: Tue, 14 Mar 2017 17:06:01 +0000 From: Lee Jones To: Charles Keepax Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH RESEND 1/4] mfd: arizona: Remove duplicate set of ret variable Message-ID: <20170314170601.nofl5czp4btsrmj4@dell> References: <1489051715-4774-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1489051715-4774-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1617 Lines: 49 On Thu, 09 Mar 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 > --- > drivers/mfd/arizona-core.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) For my own reference: Acked-for-MFD-by: Lee Jones > 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