From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752216AbcGARgU (ORCPT ); Fri, 1 Jul 2016 13:36:20 -0400 Received: from mout.web.de ([212.227.15.14]:60028 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751036AbcGARgS (ORCPT ); Fri, 1 Jul 2016 13:36:18 -0400 To: Lee Jones , kernel-janitors@vger.kernel.org Cc: Linux Kernel Mailing List , Julia Lawall From: SF Markus Elfring Subject: [PATCH v4] mfd: dm355evm_msp: Refactoring for add_child() Message-ID: <4dcb4cab-e2cc-87c0-9cfc-d140f185254b@users.sourceforge.net> Date: Fri, 1 Jul 2016 19:29:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:sNyvw8mIFbWv3SRLXwzDaooAXycS7pd2DSDAG4Jj/Q7KledYuJ5 P+ohA51IphTA+ZPSRPXfDlyU0rCJ/L20DHsFmFLNjbLuskbX6HBx9xtdRfKuS6CnALy+/Er TjhP7xbb4/533OwFOoe+flZTLl2IR7uuDpeV35VNeAv65cL/DWgWKPYXD/O0Ed00M+rEWPM zVT8ZBRcU2j95/aTsBNhQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:hjTOX82joHk=:yNplkifZCunujN1I03OFGN THHtFrbO+oAmneEdJ/wcS/IH0s1Svwjchmla9RATWrIaaoOaAFG9tUu/nKI4MieRaoCVR3kH7 AJFe7KGc3+pUxD3U9LTb3nGvFfs+zK62tWqRTne4aHnBG548GfvHYmXjn2uOFnUijXbRcW7WM JnK5Lv7NIkoYdZKE1+tXBw7QV14WLmzQcRGXJJBtt6RzNckHDyG0sNC4FpvMkPrQQLWm+aSuJ LiqMsXDncXaLCGUtac1UbDijq0iMSF2XDQD1NXCLbdvf98s5hijnNi//yYA5k0/g9rpEDmb9Y 5mDE+Hc7J4aRU/+BEgluS1GWLmxPxE+WeGkMUOAKXb+OG+8rfExeJbQs92p33DWHr7Zvot4lJ 6LRiF0jGjtil3rk3FAZRV0qqupnBMFXMvn4iVJilVAPOoDkBbVIwy3u/MYLiAVAzvMahDKhLQ 49/luWhuMEL+UML/rYWyc7qfxXWFI3s319WlUciyZZhIVK/Jj2Js5qXcdQc1y19xvOP8wuQAQ oiJVCFLflrTVvxUXV93tEtWnmDaknIOv2nQkWAVYkQ/xrt/Ej4YUtzPy/fhuGlbFaROPsRpod Dy3bAGbg1Ueu1AFap/CcxVI8DhdmOT2WpqzWB7mdFkjsrb/4gqJF0UbpfKSpUFHGs0t42UwRD DSpNEZSX5jMMg6UCyilCfjPdYWVybi+aIamlMxZN8TfY4JTxtwyfJBU1bq0IxU1fqZi0ZwSBt nQ3QUtvHDD+UOyAijzP7Nw8R2kR08QxDp2zvQzBuA3JaZNxaI/KxgGztB6oHlksLfiQ2BUm2G U7NzvNi Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- v4: Further feedback was integrated into this message. v3: Deletion of another blank line v2: Rebasing 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