iio: accel: mma9553: refactor mma9553_read_raw

Refactor code for simplicity and clarity.

Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Suggested-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
index b17848eae9ce88ba35dd4a499a0c132e46060269..032537fc2c561a7d6aebdd249f1eabfb71e3c43c 100644 (file)
--- a/drivers/iio/accel/mma9553.c
+++ b/drivers/iio/accel/mma9553.c
@@ -441,6 +441,32 @@ static int mma9553_init(struct mma9553_data *data)
        return mma9551_set_device_state(data->client, true);
 }
 
+static int mma9553_read_status_word(struct mma9553_data *data, u16 reg,
+                                   u16 *tmp)
+{
+       bool powered_on;
+       int ret;
+
+       /*
+        * The HW only counts steps and other dependent
+        * parameters (speed, distance, calories, activity)
+        * if power is on (from enabling an event or the
+        * step counter).
+        */
+       powered_on = mma9553_is_any_event_enabled(data, false, 0) ||
+                    data->stepcnt_enabled;
+       if (!powered_on) {
+               dev_err(&data->client->dev, "No channels enabled\n");
+               return -EINVAL;
+       }
+
+       mutex_lock(&data->mutex);
+       ret = mma9551_read_status_word(data->client, MMA9551_APPID_PEDOMETER,
+                                      reg, tmp);
+       mutex_unlock(&data->mutex);
+       return ret;
+}
+
 static int mma9553_read_raw(struct iio_dev *indio_dev,
                            struct iio_chan_spec const *chan,
                            int *val, int *val2, long mask)
@@ -449,70 +475,30 @@ static int mma9553_read_raw(struct iio_dev *indio_dev,
        int ret;
        u16 tmp;
        u8 activity;
-       bool powered_on;
 
        switch (mask) {
        case IIO_CHAN_INFO_PROCESSED:
                switch (chan->type) {
                case IIO_STEPS:
-                       /*
-                        * The HW only counts steps and other dependent
-                        * parameters (speed, distance, calories, activity)
-                        * if power is on (from enabling an event or the
-                        * step counter).
-                        */
-                       powered_on =
-                           mma9553_is_any_event_enabled(data, false, 0) ||
-                           data->stepcnt_enabled;
-                       if (!powered_on) {
-                               dev_err(&data->client->dev,
-                                       "No channels enabled\n");
-                               return -EINVAL;
-                       }
-                       mutex_lock(&data->mutex);
-                       ret = mma9551_read_status_word(data->client,
-                                                      MMA9551_APPID_PEDOMETER,
+                       ret = mma9553_read_status_word(data,
                                                       MMA9553_REG_STEPCNT,
                                                       &tmp);
-                       mutex_unlock(&data->mutex);
                        if (ret < 0)
                                return ret;
                        *val = tmp;
                        return IIO_VAL_INT;
                case IIO_DISTANCE:
-                       powered_on =
-                           mma9553_is_any_event_enabled(data, false, 0) ||
-                           data->stepcnt_enabled;
-                       if (!powered_on) {
-                               dev_err(&data->client->dev,
-                                       "No channels enabled\n");
-                               return -EINVAL;
-                       }
-                       mutex_lock(&data->mutex);
-                       ret = mma9551_read_status_word(data->client,
-                                                      MMA9551_APPID_PEDOMETER,
+                       ret = mma9553_read_status_word(data,
                                                       MMA9553_REG_DISTANCE,
                                                       &tmp);
-                       mutex_unlock(&data->mutex);
                        if (ret < 0)
                                return ret;
                        *val = tmp;
                        return IIO_VAL_INT;
                case IIO_ACTIVITY:
-                       powered_on =
-                           mma9553_is_any_event_enabled(data, false, 0) ||
-                           data->stepcnt_enabled;
-                       if (!powered_on) {
-                               dev_err(&data->client->dev,
-                                       "No channels enabled\n");
-                               return -EINVAL;
-                       }
-                       mutex_lock(&data->mutex);
-                       ret = mma9551_read_status_word(data->client,
-                                                      MMA9551_APPID_PEDOMETER,
+                       ret = mma9553_read_status_word(data,
                                                       MMA9553_REG_STATUS,
                                                       &tmp);
-                       mutex_unlock(&data->mutex);
                        if (ret < 0)
                                return ret;
 
@@ -537,38 +523,17 @@ static int mma9553_read_raw(struct iio_dev *indio_dev,
                case IIO_VELOCITY:      /* m/h */
                        if (chan->channel2 != IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z)
                                return -EINVAL;
-                       powered_on =
-                           mma9553_is_any_event_enabled(data, false, 0) ||
-                           data->stepcnt_enabled;
-                       if (!powered_on) {
-                               dev_err(&data->client->dev,
-                                       "No channels enabled\n");
-                               return -EINVAL;
-                       }
-                       mutex_lock(&data->mutex);
-                       ret = mma9551_read_status_word(data->client,
-                                                      MMA9551_APPID_PEDOMETER,
-                                                      MMA9553_REG_SPEED, &tmp);
-                       mutex_unlock(&data->mutex);
+                       ret = mma9553_read_status_word(data,
+                                                      MMA9553_REG_SPEED,
+                                                      &tmp);
                        if (ret < 0)
                                return ret;
                        *val = tmp;
                        return IIO_VAL_INT;
                case IIO_ENERGY:        /* Cal or kcal */
-                       powered_on =
-                           mma9553_is_any_event_enabled(data, false, 0) ||
-                           data->stepcnt_enabled;
-                       if (!powered_on) {
-                               dev_err(&data->client->dev,
-                                       "No channels enabled\n");
-                               return -EINVAL;
-                       }
-                       mutex_lock(&data->mutex);
-                       ret = mma9551_read_status_word(data->client,
-                                                      MMA9551_APPID_PEDOMETER,
+                       ret = mma9553_read_status_word(data,
                                                       MMA9553_REG_CALORIES,
                                                       &tmp);
-                       mutex_unlock(&data->mutex);
                        if (ret < 0)
                                return ret;
                        *val = tmp;