From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934341AbbEMMVP (ORCPT ); Wed, 13 May 2015 08:21:15 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:38783 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934320AbbEMMVL (ORCPT ); Wed, 13 May 2015 08:21:11 -0400 Date: Wed, 13 May 2015 13:21:06 +0100 From: Lee Jones To: Charles Keepax Cc: broonie@kernel.org, lgirdwood@gmail.com, sameo@linux.intel.com, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org Subject: Re: [RESEND PATCH v3 04/10] mfd: arizona: Fix formating/style issues in arizona_apply_hardware_patch Message-ID: <20150513122106.GP3394@x1> References: <1431349090-24173-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1431349090-24173-5-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: <1431349090-24173-5-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 11 May 2015, Charles Keepax wrote: > In preparation for some refactoring fixup some minor style, formating > and code clarity issues. > > Signed-off-by: Charles Keepax > Acked-by: Lee Jones > --- > drivers/mfd/arizona-core.c | 37 +++++++++++++++++-------------------- > 1 files changed, 17 insertions(+), 20 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index 0df1299..326a4af 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -264,20 +264,20 @@ static void arizona_disable_reset(struct arizona *arizona) > } > } > > -static int arizona_apply_hardware_patch(struct arizona* arizona) > +static int wm5102_apply_hardware_patch(struct arizona *arizona) > { > unsigned int fll, sysclk; > int ret, err; > > /* Cache existing FLL and SYSCLK settings */ > ret = regmap_read(arizona->regmap, ARIZONA_FLL1_CONTROL_1, &fll); > - if (ret != 0) { > + if (ret) { > dev_err(arizona->dev, "Failed to cache FLL settings: %d\n", > ret); > return ret; > } > ret = regmap_read(arizona->regmap, ARIZONA_SYSTEM_CLOCK_1, &sysclk); > - if (ret != 0) { > + if (ret) { > dev_err(arizona->dev, "Failed to cache SYSCLK settings: %d\n", > ret); > return ret; > @@ -286,7 +286,7 @@ static int arizona_apply_hardware_patch(struct arizona* arizona) > /* Start up SYSCLK using the FLL in free running mode */ > ret = regmap_write(arizona->regmap, ARIZONA_FLL1_CONTROL_1, > ARIZONA_FLL1_ENA | ARIZONA_FLL1_FREERUN); > - if (ret != 0) { > + if (ret) { > dev_err(arizona->dev, > "Failed to start FLL in freerunning mode: %d\n", > ret); > @@ -295,36 +295,36 @@ static int arizona_apply_hardware_patch(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 != 0) { > + if (ret) { > ret = -ETIMEDOUT; > goto err_fll; > } > > ret = regmap_write(arizona->regmap, ARIZONA_SYSTEM_CLOCK_1, 0x0144); > - if (ret != 0) { > + if (ret) { > dev_err(arizona->dev, "Failed to start SYSCLK: %d\n", ret); > goto err_fll; > } > > /* Start the write sequencer and wait for it to finish */ > ret = regmap_write(arizona->regmap, ARIZONA_WRITE_SEQUENCER_CTRL_0, > - ARIZONA_WSEQ_ENA | ARIZONA_WSEQ_START | 160); > - if (ret != 0) { > + ARIZONA_WSEQ_ENA | ARIZONA_WSEQ_START | 160); > + if (ret) { > dev_err(arizona->dev, "Failed to start write sequencer: %d\n", > ret); > goto err_sysclk; > } > ret = arizona_poll_reg(arizona, 5, ARIZONA_WRITE_SEQUENCER_CTRL_1, > ARIZONA_WSEQ_BUSY, 0); > - if (ret != 0) { > + if (ret) { > regmap_write(arizona->regmap, ARIZONA_WRITE_SEQUENCER_CTRL_0, > - ARIZONA_WSEQ_ABORT); > + ARIZONA_WSEQ_ABORT); > ret = -ETIMEDOUT; > } > > err_sysclk: > err = regmap_write(arizona->regmap, ARIZONA_SYSTEM_CLOCK_1, sysclk); > - if (err != 0) { > + if (err) { > dev_err(arizona->dev, > "Failed to re-apply old SYSCLK settings: %d\n", > err); > @@ -332,16 +332,13 @@ err_sysclk: > > err_fll: > err = regmap_write(arizona->regmap, ARIZONA_FLL1_CONTROL_1, fll); > - if (err != 0) { > + if (err) { > dev_err(arizona->dev, > "Failed to re-apply old FLL settings: %d\n", > err); > } > > - if (ret != 0) > - return ret; > - else > - return err; > + return ret ?: err; > } > > static int wm5102_clear_write_sequencer(struct arizona *arizona) > @@ -407,8 +404,8 @@ static int arizona_runtime_resume(struct device *dev) > goto err; > } > > - ret = arizona_apply_hardware_patch(arizona); > - if (ret != 0) { > + ret = wm5102_apply_hardware_patch(arizona); > + if (ret) { > dev_err(arizona->dev, > "Failed to apply hardware patch: %d\n", > ret); > @@ -924,8 +921,8 @@ int arizona_dev_init(struct arizona *arizona) > > switch (arizona->type) { > case WM5102: > - ret = arizona_apply_hardware_patch(arizona); > - if (ret != 0) { > + ret = wm5102_apply_hardware_patch(arizona); > + if (ret) { > dev_err(arizona->dev, > "Failed to apply hardware patch: %d\n", > ret); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog