From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.web.de ([212.227.17.11]:56248 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932246AbdJZPAZ (ORCPT ); Thu, 26 Oct 2017 11:00:25 -0400 To: linux-iio@vger.kernel.org, Andreas Klinger , Hartmut Knaack , Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] iio/proximity/srf08: Improve unlocking of a mutex in srf08_read_ranging() Message-ID: <62f61dbd-b106-1d3f-fb75-3fa87251e6ef@users.sourceforge.net> Date: Thu, 26 Oct 2017 17:00:07 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org From: Markus Elfring Date: Thu, 26 Oct 2017 16:51:08 +0200 Add a jump target so that a call of the function "mutex_unlock" is stored only once at the end of this function implementation. Replace two calls by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/iio/proximity/srf08.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c index f2bf783f829a..85957550195b 100644 --- a/drivers/iio/proximity/srf08.c +++ b/drivers/iio/proximity/srf08.c @@ -135,8 +135,7 @@ static int srf08_read_ranging(struct srf08_data *data) SRF08_WRITE_COMMAND, SRF08_CMD_RANGING_CM); if (ret < 0) { dev_err(&client->dev, "write command - err: %d\n", ret); - mutex_unlock(&data->lock); - return ret; + goto unlock; } /* @@ -163,20 +162,17 @@ static int srf08_read_ranging(struct srf08_data *data) if (ret >= 255 || ret <= 0) { dev_err(&client->dev, "device not ready\n"); - mutex_unlock(&data->lock); - return -EIO; + ret = -EIO; + goto unlock; } ret = i2c_smbus_read_word_swapped(data->client, SRF08_READ_ECHO_1_HIGH); - if (ret < 0) { + if (ret < 0) dev_err(&client->dev, "cannot read distance: ret=%d\n", ret); - mutex_unlock(&data->lock); - return ret; - } +unlock: mutex_unlock(&data->lock); - return ret; } -- 2.14.3