[PATCH] iio/accel/kxcjk-1013: Improve unlocking of a mutex in three functions

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Tue, 13 Mar 2018 13:40:12 +0100

* Add jump targets so that a call of the function "mutex_unlock" is stored
  less often in these function implementations.

* Replace eight calls by goto statements.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/iio/accel/kxcjk-1013.c | 46 ++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index af53a1084ee5..4adf38b6d939 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -765,19 +765,18 @@ static int kxcjk1013_read_raw(struct iio_dev *indio_dev,
                        ret = -EBUSY;
                else {
                        ret = kxcjk1013_set_power_state(data, true);
-                       if (ret < 0) {
-                               mutex_unlock(&data->mutex);
-                               return ret;
-                       }
+                       if (ret < 0)
+                               goto unlock;
+
                        ret = kxcjk1013_get_acc_reg(data, chan->scan_index);
                        if (ret < 0) {
                                kxcjk1013_set_power_state(data, false);
-                               mutex_unlock(&data->mutex);
-                               return ret;
+                               goto unlock;
                        }
                        *val = sign_extend32(ret >> 4, 11);
                        ret = kxcjk1013_set_power_state(data, false);
                }
+unlock:
                mutex_unlock(&data->mutex);
 
                if (ret < 0)
@@ -905,8 +904,8 @@ static int kxcjk1013_write_event_config(struct iio_dev 
*indio_dev,
 
        if (!state && data->motion_trigger_on) {
                data->ev_enable_state = 0;
-               mutex_unlock(&data->mutex);
-               return 0;
+               ret = 0;
+               goto unlock;
        }
 
        /*
@@ -919,23 +918,20 @@ static int kxcjk1013_write_event_config(struct iio_dev 
*indio_dev,
         * is always on so sequence doesn't matter
         */
        ret = kxcjk1013_set_power_state(data, state);
-       if (ret < 0) {
-               mutex_unlock(&data->mutex);
-               return ret;
-       }
+       if (ret < 0)
+               goto unlock;
 
        ret =  kxcjk1013_setup_any_motion_interrupt(data, state);
        if (ret < 0) {
                kxcjk1013_set_power_state(data, false);
                data->ev_enable_state = 0;
-               mutex_unlock(&data->mutex);
-               return ret;
+               goto unlock;
        }
 
        data->ev_enable_state = state;
+unlock:
        mutex_unlock(&data->mutex);
-
-       return 0;
+       return ret;
 }
 
 static int kxcjk1013_buffer_preenable(struct iio_dev *indio_dev)
@@ -1086,32 +1082,30 @@ static int kxcjk1013_data_rdy_trigger_set_state(struct 
iio_trigger *trig,
 
        if (!state && data->ev_enable_state && data->motion_trigger_on) {
                data->motion_trigger_on = false;
-               mutex_unlock(&data->mutex);
-               return 0;
+               ret = 0;
+               goto unlock;
        }
 
        ret = kxcjk1013_set_power_state(data, state);
-       if (ret < 0) {
-               mutex_unlock(&data->mutex);
-               return ret;
-       }
+       if (ret < 0)
+               goto unlock;
+
        if (data->motion_trig == trig)
                ret = kxcjk1013_setup_any_motion_interrupt(data, state);
        else
                ret = kxcjk1013_setup_new_data_interrupt(data, state);
        if (ret < 0) {
                kxcjk1013_set_power_state(data, false);
-               mutex_unlock(&data->mutex);
-               return ret;
+               goto unlock;
        }
        if (data->motion_trig == trig)
                data->motion_trigger_on = state;
        else
                data->dready_trigger_on = state;
 
+unlock:
        mutex_unlock(&data->mutex);
-
-       return 0;
+       return ret;
 }
 
 static const struct iio_trigger_ops kxcjk1013_trigger_ops = {
-- 
2.16.2