From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752478AbcF1PCs (ORCPT ); Tue, 28 Jun 2016 11:02:48 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:38348 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752250AbcF1PCq (ORCPT ); Tue, 28 Jun 2016 11:02:46 -0400 Date: Tue, 28 Jun 2016 16:03:36 +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 2/6] mfd: twl-core: Refactoring for add_numbered_child() Message-ID: <20160628150336.GJ24982@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> <9cf59380-e999-0cf8-9b8d-106691b86d0b@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <9cf59380-e999-0cf8-9b8d-106691b86d0b@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:03:59 +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 > Acked-by: Lee Jones > --- > drivers/mfd/twl-core.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index 9458c6d..a49d3db 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -631,7 +631,7 @@ add_numbered_child(unsigned mod_no, const char *name, int num, > 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; > } > } > > @@ -644,21 +644,22 @@ add_numbered_child(unsigned mod_no, const char *name, int num, > status = platform_device_add_resources(pdev, r, irq1 ? 2 : 1); > if (status < 0) { > dev_dbg(&pdev->dev, "can't add irqs\n"); > - goto err; > + goto put_device; > } > } > > status = platform_device_add(pdev); > - if (status == 0) > - device_init_wakeup(&pdev->dev, can_wakeup); > + if (status) > + goto put_device; > + > + device_init_wakeup(&pdev->dev, can_wakeup); > > -err: > - if (status < 0) { > - platform_device_put(pdev); > - dev_err(&twl->client->dev, "can't add %s dev\n", name); > - return ERR_PTR(status); > - } > return &pdev->dev; > + > +put_device: > + platform_device_put(pdev); > + dev_err(&twl->client->dev, "failed to add device %s\n", name); > + return ERR_PTR(status); > } > > static inline struct device *add_child(unsigned mod_no, const char *name, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog