From patchwork Mon Oct 30 14:00:07 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: 832056 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 3yQbjM2LY7z9t3R for ; Tue, 31 Oct 2017 01:00:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752517AbdJ3OAW (ORCPT ); Mon, 30 Oct 2017 10:00:22 -0400 Received: from mout.web.de ([217.72.192.78]:51622 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455AbdJ3OAU (ORCPT ); Mon, 30 Oct 2017 10:00:20 -0400 Received: from [192.168.1.2] ([77.181.252.76]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Mas22-1dtIgl2J8U-00KLij; Mon, 30 Oct 2017 15:00:17 +0100 To: linux-gpio@vger.kernel.org, Linus Walleij Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] pinctrl: max77620: Use common error handling code in max77620_pinconf_set() Message-ID: Date: Mon, 30 Oct 2017 15:00:07 +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:LyLLuWqUqfyOEb4zbTRvzQ4HGUyytuA0BTF1J775ajAV08qdQL7 iddMzz4oUk82LZgnuEf1VBtRImETW4bD5C6bAJpT1WjJor4qYTK1ArPurOndBbXCeOJtsHp 409VBwO96I5gp5ZTR5TsdJ/3ZKBw+BzvEi1mhwIe2gma9+uSgao6waZWr/3o2n+w1+akiL4 bsB010tVaBmEbr94bNT8g== X-UI-Out-Filterresults: notjunk:1; V01:K0:T66t6UyCmZ8=:hIIuhWM4QPbv5EygGvoMgK 0KOxN1KFdZPDw6rbmt9A+Z9RfgF8b+3bHCccHPvIYihxG3HjCGamKKq3CIjRiiXf5nzhw8T85 LDpljVTO0GcDWMu4wzdsEWoEnOmclgVGxnNdTsPLQa3pq8YyIB/rCa9AXzF9n2TOsA7CT1Htp zDZ7JS/qez+mqnmyytIdHc31quNCZrL2QDt1Hnsf02UFb5njPToTQSuH1aO3y3kUrKUNmCfkV psouFCIlPoyqZIOJ15/37Sm2zTBRi/eX5P6Tj9PHIBFnBrp/Bu2/fJhE8+JB85Fzo16riB4hF CBJLo2mS169/rbr9l5NoDuzR5ZV4V0nqK1ERj4ZR+SABD8cJADbZDUmOn4/BleVFkHFK7jzNi N9Hb2wkhBzun354ax/0ukSG114OtVEuB0jxnxDm6mFGEp2JswvqWPpuRNwmXSWsIjE1zrzYck WxAXA66fhXxd+l3uRpLdofNEydG6yJ0m0Ngsk+MVtPCJGQk215aDq3ccufFewsGfYhy36MRUi OSPvHpsXabxoxkVjNmjsJWdRk/366uimH3PJbxYcZC6HIBwWuWqCtUlR+ZjRGK6XlVJjVVRCT 3N0H5QLzFlgiL4juK4kMVOgWUHXJ/NAjGu/+7IcRyw/spcPJpcI5wdGo9RF3twCBcx9PRvwPX O4P95XEgko2dGt+wPX3jkkRT6RF5ytVhWINxL/mLtjHV7JK3zwVlnK0hc3oIuci1mmSvwtTCc Y0FBHujmDyK1BhMqKDL0IfNs4L4Nas8QP6ffwx/8H2FFJjJcf3SuEN6Oq8uK/7r7RASwvIcOZ TNyyP+67YoxgDEQw7Ta9yEv7gHqimKHAaoOlVzRGgcJlCyaYok= 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 14:55:52 +0100 * Add a jump target so that a specific error message is stored only once at the end of this function implementation. * Replace two calls of the function "dev_err" by goto statements. * Adjust two condition checks. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/pinctrl/pinctrl-max77620.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/pinctrl/pinctrl-max77620.c b/drivers/pinctrl/pinctrl-max77620.c index b8d2180a2bea..a7f37063518e 100644 --- a/drivers/pinctrl/pinctrl-max77620.c +++ b/drivers/pinctrl/pinctrl-max77620.c @@ -420,11 +420,9 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev, MAX77620_REG_GPIO0 + pin, MAX77620_CNFG_GPIO_DRV_MASK, val); - if (ret < 0) { - dev_err(dev, "Reg 0x%02x update failed %d\n", - MAX77620_REG_GPIO0 + pin, ret); - return ret; - } + if (ret) + goto report_update_failure; + mpci->pin_info[pin].drv_type = val ? MAX77620_PIN_PP_DRV : MAX77620_PIN_OD_DRV; break; @@ -435,11 +433,9 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev, MAX77620_REG_GPIO0 + pin, MAX77620_CNFG_GPIO_DRV_MASK, val); - if (ret < 0) { - dev_err(dev, "Reg 0x%02x update failed %d\n", - MAX77620_REG_GPIO0 + pin, ret); - return ret; - } + if (ret) + goto report_update_failure; + mpci->pin_info[pin].drv_type = val ? MAX77620_PIN_PP_DRV : MAX77620_PIN_OD_DRV; break; @@ -536,6 +532,11 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev, } return 0; + +report_update_failure: + dev_err(dev, "Reg 0x%02x update failed %d\n", + MAX77620_REG_GPIO0 + pin, ret); + return ret; } static const struct pinconf_ops max77620_pinconf_ops = {