linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-iio@vger.kernel.org, Andreas Klinger <ak@it-klinger.de>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Jonathan Cameron <jic23@kernel.org>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] iio/proximity/srf08: Improve unlocking of a mutex in srf08_read_ranging()
Date: Thu, 26 Oct 2017 17:00:07 +0200	[thread overview]
Message-ID: <62f61dbd-b106-1d3f-fb75-3fa87251e6ef@users.sourceforge.net> (raw)

From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
 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


             reply	other threads:[~2017-10-26 15:00 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-26 15:00 SF Markus Elfring [this message]
2017-10-26 16:18 ` [PATCH] iio/proximity/srf08: Improve unlocking of a mutex in srf08_read_ranging() Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=62f61dbd-b106-1d3f-fb75-3fa87251e6ef@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=ak@it-klinger.de \
    --cc=jic23@kernel.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).