From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752577AbcF1PGn (ORCPT ); Tue, 28 Jun 2016 11:06:43 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:33054 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752432AbcF1PGk (ORCPT ); Tue, 28 Jun 2016 11:06:40 -0400 Date: Tue, 28 Jun 2016 16:07:25 +0100 From: Lee Jones To: SF Markus Elfring Cc: Tony Lindgren , linux-omap@vger.kernel.org, LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() Message-ID: <20160628150725.GL24982@dell> References: <566ABCD9.1060404@users.sourceforge.net> <5682D228.7070902@users.sourceforge.net> <20160111082922.GB14104@x1> <05b7db2a-437a-60ac-d289-71d2150e7f5f@users.sourceforge.net> <20160608111442.GB14888@dell> <75c1cc23-3a2d-db78-d0f2-b5934b18e828@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <75c1cc23-3a2d-db78-d0f2-b5934b18e828@users.sourceforge.net> User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 26 Jun 2016, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sun, 26 Jun 2016 13:56:58 +0200 > > Adjust jump targets according to the Linux coding style convention. > Another check for the variable "status" can be omitted then at the end. > > Signed-off-by: Markus Elfring > --- > drivers/mfd/dm355evm_msp.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c > index 270e19c..baf6075 100644 > --- a/drivers/mfd/dm355evm_msp.c > +++ b/drivers/mfd/dm355evm_msp.c > @@ -209,7 +209,7 @@ static struct device *add_child(struct i2c_client *client, const char *name, > status = platform_device_add_data(pdev, pdata, pdata_len); > if (status < 0) { > dev_dbg(&pdev->dev, "can't add platform_data\n"); > - goto err; > + goto put_device; > } > } > > @@ -222,19 +222,21 @@ static struct device *add_child(struct i2c_client *client, const char *name, > status = platform_device_add_resources(pdev, &r, 1); > if (status < 0) { > dev_dbg(&pdev->dev, "can't add irq\n"); > - goto err; > + goto put_device; > } > } > > status = platform_device_add(pdev); > Remove this line too. > -err: > - if (status < 0) { > - platform_device_put(pdev); > - dev_err(&client->dev, "can't add %s dev\n", name); > - return ERR_PTR(status); > - } > + if (status) > + goto put_device; > + > return &pdev->dev; > + > +put_device: > + platform_device_put(pdev); > + dev_err(&client->dev, "failed to add device %s\n", name); > + return ERR_PTR(status); > } > > static int add_children(struct i2c_client *client) -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog