From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752489AbcF3UQB (ORCPT ); Thu, 30 Jun 2016 16:16:01 -0400 Received: from mout.web.de ([212.227.17.11]:60562 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751487AbcF3UP7 (ORCPT ); Thu, 30 Jun 2016 16:15:59 -0400 Subject: [PATCH] mfd: dm355evm_msp: Refactoring for add_child() To: Lee Jones 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> <20160628150725.GL24982@dell> <20160628163146.GG29166@dell> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <69e96aa0-f3d9-d70d-c3ec-d39b5e9d9f14@users.sourceforge.net> Date: Thu, 30 Jun 2016 22:15:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <20160628163146.GG29166@dell> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:auedsVCPNvGg6GggY8tWNDwXsHq6LhlOvD8hv5zOMD5w8aCVVPb qPEXz3/VCPVbLJekDaij8hmDnvM5iY9PbHSXxzuFjHsU7eLv8L4NX+s6KEJ4MZ2zjXzXkj2 yLqWj3HGbHpkwUWx2aZZrnPlWJfpYApWltbf3hjcnBC0FUDv/UN4Ven+FXD0WtH3yAJnot3 2huOxNPEEiYYhYZ+Lm/NA== X-UI-Out-Filterresults: notjunk:1;V01:K0:t6pSD4RnmVE=:OuzwVQPEVRBKLLC+rkpLeD Ges536/hSCkFQ3DG4es2ymnhPNpwNbEi7UwC8cX9sM08IjIF3l51VOLJl1sgrXQ3EFGhXCKCb pbAWtZZSjkAgkSMZoJOT0zyAoskjP2n/XQwGPn7g7Os37aJReFWCAAr5HbbJIuiKbOgY7UM2+ VSvxHLoxNY7BCcmxIOd2q9xDBan7hG16uOX3wU5kobT1PAMvl5p4PXC4sLjxtRw+oJrNO7w2P 2BV6J/pHQwvFIPeIbywLofiLKUOmg3KSRTIuuTLIY5V7LaQOcmuTeQz/bGoN7G/+n545WGVXg /TvameX0V8HNeRsH7cq8anbWSHljtDbM8g2SFGajWfAH+jjPwvLQSh54l5rS4/MASL4BdE2bV 649vWZ1jPhQu2Cub/bw9AHGeUJY5vxTZquoF81aKfwB5zxd4TRWU0mKoDMUuz7jL9PIsPyEhi FULv4Ypt5ueYn9DBbiUirvUVlioRW1U0CbVat3brKI4ng0ijE0cCZ4hvmAQhHAsEXPe4suiU1 GMrRPfUtPv7IY4TpVfxhHZDeKqitA9Mj1O6aM7hcdFl7i/YUyUeD4pTxC0XWKPisTDK7zFcpz Y3f5emBUtapZKo0XmQVw8BoICiYMkgwzDYZmw2GfmpzFzBq5zl+z8/HJ6uUF/nkErZV4X4WjM JE0Oi8/PvMvCpXAh7poCpE/uiOU5xPC1mcS49FoNPLQAqZ0TWItGLKAAmRGRFY7Q0IjJopLaJ TtoJsXBofpCtNhz6AITyC2wjCg04vo6WBqg9c8OWhZNKUeV3E8yxYDmU64HP1NSRNUhQUpbhg FnkOIcT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 30 Jun 2016 21:54:51 +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 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c index 270e19c..86eca61 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,20 @@ 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); + if (status) + goto put_device; -err: - if (status < 0) { - platform_device_put(pdev); - dev_err(&client->dev, "can't add %s dev\n", name); - return ERR_PTR(status); - } 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) -- 2.9.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Thu, 30 Jun 2016 20:15:39 +0000 Subject: [PATCH] mfd: dm355evm_msp: Refactoring for add_child() Message-Id: <69e96aa0-f3d9-d70d-c3ec-d39b5e9d9f14@users.sourceforge.net> List-Id: 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> <20160628150725.GL24982@dell> <20160628163146.GG29166@dell> In-Reply-To: <20160628163146.GG29166@dell> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Lee Jones Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Thu, 30 Jun 2016 21:54:51 +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 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c index 270e19c..86eca61 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,20 @@ 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); + if (status) + goto put_device; -err: - if (status < 0) { - platform_device_put(pdev); - dev_err(&client->dev, "can't add %s dev\n", name); - return ERR_PTR(status); - } 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) -- 2.9.0