From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753101AbdLHUOZ (ORCPT ); Fri, 8 Dec 2017 15:14:25 -0500 Received: from mout.web.de ([212.227.15.4]:60777 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750908AbdLHUOV (ORCPT ); Fri, 8 Dec 2017 15:14:21 -0500 Subject: [PATCH 3/3] serial: max3100: Improve unlocking of a mutex in max3100_probe() From: SF Markus Elfring To: linux-serial@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby Cc: LKML , kernel-janitors@vger.kernel.org References: <82c37f92-b4ee-8bea-bd10-de3b6691151d@users.sourceforge.net> Message-ID: Date: Fri, 8 Dec 2017 21:13:43 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <82c37f92-b4ee-8bea-bd10-de3b6691151d@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:PtbdLrSRLbvIuPXKKmHNEPz66gFzcFDACzPyxsY6KckQZ582hKx piYa22FvghHyfLiE2RYP6ryHK2I+0bCt9EFc6YlDPXFijANdhnnsz8UqwyNmzZNOlTIgcYr ZAfwRgHRoI5e13UlPwoEHrgsCHprxBWeZ3bBoneUiYegkAMUu48nLy0Cw5Iq4JMBua9ODwz 4D6fp0OW9ZHknsPZi7Oig== X-UI-Out-Filterresults: notjunk:1;V01:K0:mPzPSrVcaSs=:MhEEJlQn3Oy02k0SorOtKk GsS/2aQJ/mwEfl0sN/XrY7gPPB53uaQJsrS2sqG+yYAh+eUMb2fCBXXjKCtsM7yBv95pY7OvZ SUUhWb7E/dijAAR6AGkE68VC+EjgHScsLBniSzwsh4iJs0ziSDBxIQC1oJTqruOMc7O2niigg XdZ/9URa56gKijiszXN50MUx8p1zZuXdMgCwjwO9QIDphjg1oMb4aKlLzTIz8M690er4RpWps UUITGzHfLPtcWHyOh90pko+Q8RrinutVaGFUTKMvK7MeLxVy050xBG/HSqBiggholwazS1GyG UlJ4Xr1ZojAvkXM1+Mi+gnXuTrGNao5J2GKf9x4TJiM/RbdIVrcHQs8LdNeK7Caj/R9kEhR3m 0hYVMa5+OE9ZSnE7i18VTLLw9fZz8t05DWAhBRLtYWneJLGDgWnRUW4Rd5wWtqYVh1u60xu3J UL0shkOuIe8I4QCAFdwR29JV8ARtRpIz7q+WOOxfFUMyjseAe5jQOcBMcQ78GiXAWgAYD4Wzj 8gZWiKEqFWfMk8oo6JasTAWHi1weiGLhSh1eNz2YC6P9/S2q746zcL19KInmazDfGCXZA1id7 /WVJSnMBpAX22EGdampv4+Z9IsGG1koKuuli3n/jQUOFkj7pcLApyp27C2Y2TTqKxWlw7HObT c3qbcJw/mpLOxsyqw1CVAKcoawzeR0neE+1k9S5cJ4nTgBp7ajS/DQvw6zH2k90ZHkdJlEMn8 2xCWmYJ7UU8++x+d4INpQdK7IUjKWKUZGdoOnBPW1ihUCdv8AmyelT12p5M1nXIrK5tkyOHYa e62kg4jJLtyY0/OcGlOF3s/PrhiDNz6IBU3M6+ShEA14ueVah4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 8 Dec 2017 20:52:37 +0100 * Add a jump target so that a call of the function "mutex_unlock" is stored only once in this function implementation. * Replace three calls by goto statements. Signed-off-by: Markus Elfring --- drivers/tty/serial/max3100.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c index 00c0e650537d..e4908410565c 100644 --- a/drivers/tty/serial/max3100.c +++ b/drivers/tty/serial/max3100.c @@ -747,8 +747,7 @@ static int max3100_probe(struct spi_device *spi) retval = uart_register_driver(&max3100_uart_driver); if (retval) { printk(KERN_ERR "Couldn't register max3100 uart driver\n"); - mutex_unlock(&max3100s_lock); - return retval; + goto unlock; } } @@ -757,14 +756,14 @@ static int max3100_probe(struct spi_device *spi) break; if (i == MAX_MAX3100) { dev_warn(&spi->dev, "too many MAX3100 chips\n"); - mutex_unlock(&max3100s_lock); - return -ENOMEM; + retval = -ENOMEM; + goto unlock; } max3100s[i] = kzalloc(sizeof(*max3100s[i]), GFP_KERNEL); if (!max3100s[i]) { - mutex_unlock(&max3100s_lock); - return -ENOMEM; + retval = -ENOMEM; + goto unlock; } max3100s[i]->spi = spi; max3100s[i]->irq = spi->irq; @@ -803,8 +802,11 @@ static int max3100_probe(struct spi_device *spi) tx = MAX3100_WC | MAX3100_SHDN; max3100_sr(max3100s[i], tx, &rx); } + + retval = 0; +unlock: mutex_unlock(&max3100s_lock); - return 0; + return retval; } static int max3100_remove(struct spi_device *spi) -- 2.15.1