Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760940AbaGRISs (ORCPT ); Fri, 18 Jul 2014 04:18:48 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:58639 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758588AbaGRISn (ORCPT ); Fri, 18 Jul 2014 04:18:43 -0400 Date: Fri, 18 Jul 2014 09:18:36 +0100 From: Lee Jones To: Javier Martinez Canillas Cc: Mark Brown , Mike Turquette , Liam Girdwood , Alessandro Zummo , Kukjin Kim , Doug Anderson , Olof Johansson , Tomeu Vizoso , Krzysztof Kozlowski , Yadwinder Singh Brar , Tushar Behera , Andreas Farber , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 06/24] mfd: max77686: Make error checking consistent Message-ID: <20140718081836.GP30888@lee--X1> References: <1404505467-26526-1-git-send-email-javier.martinez@collabora.co.uk> <1404505467-26526-7-git-send-email-javier.martinez@collabora.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1404505467-26526-7-git-send-email-javier.martinez@collabora.co.uk> 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 Fri, 04 Jul 2014, Javier Martinez Canillas wrote: > Error checking across the driver is mostly consistent besides > a few exceptions, so change these exceptions for consistency. > > Signed-off-by: Javier Martinez Canillas > Reviewed-by: Krzysztof Kozlowski > --- > drivers/mfd/max77686.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied now, thanks. > diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c > index ada4976..87fe52e 100644 > --- a/drivers/mfd/max77686.c > +++ b/drivers/mfd/max77686.c > @@ -134,7 +134,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > > max77686 = devm_kzalloc(&i2c->dev, > sizeof(struct max77686_dev), GFP_KERNEL); > - if (max77686 == NULL) > + if (!max77686) > return -ENOMEM; > > i2c_set_clientdata(i2c, max77686); > @@ -153,8 +153,8 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > return ret; > } > > - if (regmap_read(max77686->regmap, > - MAX77686_REG_DEVICE_ID, &data) < 0) { > + ret = regmap_read(max77686->regmap, MAX77686_REG_DEVICE_ID, &data); > + if (ret < 0) { > dev_err(max77686->dev, > "device not found on this channel (this is not an error)\n"); > return -ENODEV; > @@ -180,7 +180,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > IRQF_TRIGGER_FALLING | IRQF_ONESHOT | > IRQF_SHARED, 0, &max77686_irq_chip, > &max77686->irq_data); > - if (ret != 0) { > + if (ret) { > dev_err(&i2c->dev, "failed to add PMIC irq chip: %d\n", ret); > goto err_unregister_i2c; > } > @@ -188,7 +188,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > IRQF_TRIGGER_FALLING | IRQF_ONESHOT | > IRQF_SHARED, 0, &max77686_rtc_irq_chip, > &max77686->rtc_irq_data); > - if (ret != 0) { > + if (ret) { > dev_err(&i2c->dev, "failed to add RTC irq chip: %d\n", ret); > goto err_del_irqc; > } -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/