From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932123AbdJVS1G (ORCPT ); Sun, 22 Oct 2017 14:27:06 -0400 Received: from mout.web.de ([212.227.17.12]:53702 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932069AbdJVS1E (ORCPT ); Sun, 22 Oct 2017 14:27:04 -0400 To: linux-gpio@vger.kernel.org, Linus Walleij , Thierry Reding Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] gpio-adnp: Use common error handling code in adnp_gpio_dbg_show() Message-ID: <1e2fb84c-9a5b-dc56-c93b-7eef03fc9b7a@users.sourceforge.net> Date: Sun, 22 Oct 2017 20:27:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:UjsXUsiDM6q1fiZgnbjBXMQgPwKaCIoWNplFPidtAxgOSVFpXpa fYScV5cHnCcHJsLangvVOChLi8S2pHZ5LA9VTSrmVFUK+9EkMnGyCt2JGlnUDcFlgigwEXe rL4eILGaEN7Uct3KCWqb931tNK+qgGsnNo4zIrxy8ETy1Sepa4p0/r7DnZSeaUEjVMxJjmY 6eh0GDuBOhciy/UmDqJPg== X-UI-Out-Filterresults: notjunk:1;V01:K0:FXu6wAXa8Ag=:k3hRvfxGU9lY3sp0ef/qb/ 0gF1AoQvtUHJKfB0/Pj9tCUeQ8JSmtDRcdqe2v0puoznGKirzBbwDHD6B8HF+DvjM/JPA2Tzc RvY67nstrxlrHZXnbPsNzc84/hQy2RV483/6ifcM55Sb0O2gkMmXu4/U1AoCy5FHrTK37Yc7q JSDisEhwyfe34YTzFnfRw+b5qVq/Hxg+eyzEiah6O2VX7CgaPg8mIwmmpS5BG1atrLhAUJRnw b4/BBhQ0Fby9ai5jckCTBgCDmYQPxazJ6AjjC749fsSkNNQ6fPh19mMbkH0dsBI7+jtHxk8C2 k3ZQuC7xugJBhho0/jafPBlTQKvNhqM+FWSp81G4ao6rER0NaYKuvJ341fbJMJAZBmv5gi40f AH7AxoZROKZzh68vrjiz+S647JLmZ/+YU+bUrTSMs7UiIFylP4xcC/fEziK8Rn5HnWYHbGUf+ 4B6dk+L1XrIlEE2YBw7lGH+JuqK82obzrvQMwNnbp28QdRhjcfIWyWbgFSElXctmZVKxJFvHn 86u8osb1cFHtQJ57VejVHxCa1JmvXrZX3q8X0RyNhvfG+O1ppRdhcTLUkMAjyz9WDc6IZj0Dm cptPnsaXtM21SUOnZJaYEVWr99ANwmiLR3OnRSA+y3RN7AmS9Rdu8pHLvXACpPfDSr5omAy1Z wvZGmyrDpeehafKaqLIFW3l/ujsSp1crKzNTADi9RUamuht3m8uNMw7cgE8o9UmcRe4OJZnTS U+xOMWCDh7KHeGT0xjEbPQ8prJa5rhY78tQyXDDAtBaoCrNfALoT/tcE+jMqjlUdf28KEO/gx rUib+09Xu81vHk8CmlwZPqV4NWm7l0tBBGZnZ9SRuz+Al3n2Wo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 22 Oct 2017 20:21:55 +0200 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/gpio/gpio-adnp.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c index 89863ea25de1..7f475eef3faa 100644 --- a/drivers/gpio/gpio-adnp.c +++ b/drivers/gpio/gpio-adnp.c @@ -192,28 +192,20 @@ static void adnp_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) mutex_lock(&adnp->i2c_lock); err = adnp_read(adnp, GPIO_DDR(adnp) + i, &ddr); - if (err < 0) { - mutex_unlock(&adnp->i2c_lock); - return; - } + if (err < 0) + goto unlock; err = adnp_read(adnp, GPIO_PLR(adnp) + i, &plr); - if (err < 0) { - mutex_unlock(&adnp->i2c_lock); - return; - } + if (err < 0) + goto unlock; err = adnp_read(adnp, GPIO_IER(adnp) + i, &ier); - if (err < 0) { - mutex_unlock(&adnp->i2c_lock); - return; - } + if (err < 0) + goto unlock; err = adnp_read(adnp, GPIO_ISR(adnp) + i, &isr); - if (err < 0) { - mutex_unlock(&adnp->i2c_lock); - return; - } + if (err < 0) + goto unlock; mutex_unlock(&adnp->i2c_lock); @@ -240,6 +232,11 @@ static void adnp_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) direction, level, interrupt, pending); } } + + return; + +unlock: + mutex_unlock(&adnp->i2c_lock); } static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios) -- 2.14.2