From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755366AbdKBH7k (ORCPT ); Thu, 2 Nov 2017 03:59:40 -0400 Received: from mout.web.de ([212.227.15.3]:58498 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755191AbdKBH7h (ORCPT ); Thu, 2 Nov 2017 03:59:37 -0400 Subject: [PATCH 1/3] regulator/core: Use common error handling code in regulator_resolve_supply() From: SF Markus Elfring To: kernel-janitors@vger.kernel.org, Liam Girdwood , Mark Brown Cc: LKML References: <471498fb-58af-46d4-2150-614c0f9cdc22@users.sourceforge.net> Message-ID: <61939d80-851f-601a-d5df-1278abede5c3@users.sourceforge.net> Date: Thu, 2 Nov 2017 08:59:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <471498fb-58af-46d4-2150-614c0f9cdc22@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:XCELWq4mA9+PNx0b/ogt9BD42nTGxfwVtmNSJ54wp/Fg4SBPn4B H0ZNp0StMsPDVKouckoesw8MjMnGC+nP2fZJgLXSEIQ3ryk7pRMVMjYwa/cEyowcZoANlNH ywyC+HrDagYAaIzaBT4cZvqBf+T7Teq57M5BTfO/ehtPsTxz5XBJB91kznrA6SHx4WOhvpy 1+LmHR74WXP78aW8bZlWg== X-UI-Out-Filterresults: notjunk:1;V01:K0:fSurvIrF9tQ=:8NswkJDZkIiinPUcdXqbvE gwNvxFrB/izzwaAekcVMGUl9jXRAN+/vn9/e09N6HhNLXoWnclHwLgB8/IYIah9B2iHDXHbV1 IJtw5lewt/EeMHT3yTsF81MWuo4ZB36yARz977Cf6H+BjiH6Y9PEJWBzqf0rgz4ekql5cdnuE 2N++xp3h0XhODzEYjzQ6JYw/F1Xb8aFkmvUDU9KuSpHa36iW32s3YOupW326WoapP7VNbfLpE 5D1StVRwKMKPROLbKr8OwIpxegI3tRNN1a78KYNQPeX8t1H0DGEB1EJqtUKM6soU+8DH0cy2h EsFPAalmkPvWqEz/TrcpGeH6VAcaGK8GQJkKadSi/vBGlwpHHgauXiuPC9N14cON6yoa/ojub Dl4t2UyFNtnkVcybWvKxGOYtTtBTB/fzjitwNxyxe94Fw1eFeAEGUUZiTMC/Edv7KBsbndZtD zQ1s924zlFhMjyfUGIgc19kAH+bxOolHKlRjU0EgeugYPx2XmjjI3RyodvKfer2A627Oh02RP wQFzTw5U5WHrd11OhgwVIphtgJkIpIWEWNi91r8wEI7wUq1rF15jfKct0AIpABzsS/fdq0TmG IjHgL55QhUqgouA1h0IE0fXRmZ9Jdkl4a+HepET7hxyIvPH312PtRm2/TL1AYJ/lSQR0a6YjR vmOahlzMGyPTKuHJCrDNDyYMLFCHE22zmvjOYLrs8Sdmqv94N1v88vRX7zrfpl9SbxmY0fiQX 0lhI3KIT5tYN3ggz+2V3TRTIgDf4BVxBdlXDIBrbHxmGGRTnDLqWXFjonrlNU2XKEJPijUASZ gXk4ruoulaYdq/4DoNFVeNfp6Vp6pJ8bYHZgLAHBdO0xAqbtQI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 1 Nov 2017 22:20:13 +0100 * Add a jump target so that a bit of exception handling can be better reused at the end of this function. * Adjust two condition checks. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/regulator/core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b64b7916507f..14fdf2f17a62 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1554,23 +1554,19 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) */ if (r->dev.parent && r->dev.parent != rdev->dev.parent) { if (!device_is_bound(r->dev.parent)) { - put_device(&r->dev); - return -EPROBE_DEFER; + ret = -EPROBE_DEFER; + goto put_device; } } /* Recursively resolve the supply of the supply */ ret = regulator_resolve_supply(r); - if (ret < 0) { - put_device(&r->dev); - return ret; - } + if (ret) + goto put_device; ret = set_supply(rdev, r); - if (ret < 0) { - put_device(&r->dev); - return ret; - } + if (ret) + goto put_device; /* Cascade always-on state to supply */ if (_regulator_is_enabled(rdev)) { @@ -1583,6 +1579,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } return 0; + +put_device: + put_device(&r->dev); + return ret; } /* Internal regulator request function */ -- 2.14.3