lkml.org 
[lkml]   [2017]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] iio/proximity/srf08: Improve unlocking of a mutex in srf08_read_ranging()
On Thu, 26 Oct 2017 17:00:07 +0200
SF Markus Elfring <elfring@users.sourceforge.net> wrote:

> 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>

This simple case is a reasonable change. A few minor points though.
Firstly, for a given subsystem please look at other patches to identify
the standard formatting used in patch titles.

Secondly make sure you don't make unconnected changes. Here there
is a whitespace change that should not be here.

Jonathan
> ---
> 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);
> -

Please don't make unconnected white space changes.

> return ret;
> }
>

\
 
 \ /
  Last update: 2017-10-26 18:21    [W:0.041 / U:22.652 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site