From patchwork Mon Oct 30 18:36:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 832135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQjrl2w7Lz9sRV for ; Tue, 31 Oct 2017 05:37:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752993AbdJ3ShZ (ORCPT ); Mon, 30 Oct 2017 14:37:25 -0400 Received: from mout.web.de ([212.227.17.11]:58197 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752785AbdJ3ShY (ORCPT ); Mon, 30 Oct 2017 14:37:24 -0400 Received: from [192.168.1.2] ([77.181.252.76]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LshSX-1dBbwx2AaP-012JV3; Mon, 30 Oct 2017 19:36:42 +0100 To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Barry Song , Geert Uytterhoeven , Julia Lawall , Krzysztof Kozlowski , Linus Walleij , Ludovic Desroches , Patrice Chotard , Rob Herring Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] pinctrl: sirf: Use common error handling code in sirfsoc_dt_node_to_map() Message-ID: <80911d4b-d819-335c-106e-70d7672e645b@users.sourceforge.net> Date: Mon, 30 Oct 2017 19:36:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:PWbsz3JnHkQxJVGePwvFoY2ocAF6u4/NzgG4tCZMo06lyZtDz78 PhfGEmGf+8IUl78vXRU4TsVGwohez6UNbabwvz64ChlUJAlwBLVK8k+w22VYr7g99+dtKGK bFxn5Ri1WUordFxfWvTYvf3tyk91J8W6kg0Ic7g0L4yIovRAUpcVMJb2RUUw5AcpnjakKuh onCGBVTmA1pswhhoMjspA== X-UI-Out-Filterresults: notjunk:1; V01:K0:PtBcCgv8Ddg=:8wOvY8QCYvoeK8XDoYvCER JXn898TskH216eVRcHBre1Rk1GguH5HeEWYwtDEXvHQwa+ngYo3zHe94r0zG2pzjTw/x3oRE6 Q4Ul0jXRkqx+DiHI31BLuG1p5Pt4vFGoW1+RODrdbz2hal4EKzAx9vEw+Pc6TijvLgnb+EqLt p4etk8ykLCwILRtieWAq5vs7R+ICDIcgFCJngKlec8aVkIm4B/zIN2c/ZFql584pl6MOWEmX/ f3wK3NuzbF38wkom+CsXOOkeaE8YM2OSTrS8qAtsn+DQbYYok/DbzJ73zrWLfiK4TfQAimf8I tuvGR9cy/vfaDg4dKoKBvqrKdDQUVpgQmqF8zXIVGR9PiBHKZ/OK0gMgFMMkBLiaunfF/XNeN nCEm+udJKi4QBD3OFgFK+22fPE7GtW1oQwetPxntw7JQrtBLvsQVoxJXQUh5xesFBXTuyfSqs wupSuuibUhcR1NPNVDNrFXq05d317FnZXf3qBg89j5bVoE6rRqprEI4Ij9yoO5SyM++y67iD6 eMQN+SXXz5Gt2Ixti64owXgjnHwqucK0UKBrqlTbRN4s/ybDfMW1sW6Dd2IeDMV2t4JWe0UIj YXjH7rNpkGgw0nSe3QdKBHpRNmA9sEcKKNnSEX33WCE0Li6ukOjPp5cmJnw3AIsBJ8JuSVwT3 1Lb98KYLC3MzNbKBsVY85VrJe9QQWOruBZfugSuAFSrEvlzII/906yCkcKs6cJQ9yfC1KOwGK LOcjxOCMtKopUHN4TVq3ExUCB7YfbxQfYRyJjhSpyJCXPxTa2/v3faijmYlNDKdb+u+mp/IrI FAeGeleHCtggp+VipniSLmt1J36c2gcIKAka1LGcczS6yeFvE4= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Markus Elfring Date: Mon, 30 Oct 2017 19:26:56 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/pinctrl/sirf/pinctrl-sirf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c index d64add0b84cc..5ec2f37f5180 100644 --- a/drivers/pinctrl/sirf/pinctrl-sirf.c +++ b/drivers/pinctrl/sirf/pinctrl-sirf.c @@ -89,16 +89,12 @@ static int sirfsoc_dt_node_to_map(struct pinctrl_dev *pctldev, /* calculate number of maps required */ for_each_child_of_node(np_config, np) { ret = of_property_read_string(np, "sirf,function", &function); - if (ret < 0) { - of_node_put(np); - return ret; - } + if (ret < 0) + goto put_node; ret = of_property_count_strings(np, "sirf,pins"); - if (ret < 0) { - of_node_put(np); - return ret; - } + if (ret < 0) + goto put_node; count += ret; } @@ -125,6 +121,10 @@ static int sirfsoc_dt_node_to_map(struct pinctrl_dev *pctldev, *num_maps = count; return 0; + +put_node: + of_node_put(np); + return ret; } static void sirfsoc_dt_free_map(struct pinctrl_dev *pctldev,