iio: accel: mma8452: Factor out guts of write_raw() to simplify locking

Factoring out those parts of write_raw() in which direct mode is held
allows for direct returns on errors, simplifying the code.

Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250217140135.896574-3-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 1b2014c4c4b469233038a16447063cf33dfe690c..8ce4ddadc559195278fe7f3a358de5cc6d5381d1 100644 (file)
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -707,55 +707,45 @@ static int mma8452_set_hp_filter_frequency(struct mma8452_data *data,
        return mma8452_change_config(data, MMA8452_HP_FILTER_CUTOFF, reg);
 }
 
-static int mma8452_write_raw(struct iio_dev *indio_dev,
+static int __mma8452_write_raw(struct iio_dev *indio_dev,
                             struct iio_chan_spec const *chan,
                             int val, int val2, long mask)
 {
        struct mma8452_data *data = iio_priv(indio_dev);
        int i, j, ret;
 
-       ret = iio_device_claim_direct_mode(indio_dev);
-       if (ret)
-               return ret;
-
        switch (mask) {
        case IIO_CHAN_INFO_SAMP_FREQ:
                i = mma8452_get_samp_freq_index(data, val, val2);
-               if (i < 0) {
-                       ret = i;
-                       break;
-               }
+               if (i < 0)
+                       return i;
+
                data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
                data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
 
                data->sleep_val = mma8452_calculate_sleep(data);
 
-               ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
-                                           data->ctrl_reg1);
-               break;
+               return mma8452_change_config(data, MMA8452_CTRL_REG1,
+                                            data->ctrl_reg1);
+
        case IIO_CHAN_INFO_SCALE:
                i = mma8452_get_scale_index(data, val, val2);
-               if (i < 0) {
-                       ret = i;
-                       break;
-               }
+               if (i < 0)
+                       return  i;
 
                data->data_cfg &= ~MMA8452_DATA_CFG_FS_MASK;
                data->data_cfg |= i;
 
-               ret = mma8452_change_config(data, MMA8452_DATA_CFG,
-                                           data->data_cfg);
-               break;
+               return mma8452_change_config(data, MMA8452_DATA_CFG,
+                                            data->data_cfg);
+
        case IIO_CHAN_INFO_CALIBBIAS:
-               if (val < -128 || val > 127) {
-                       ret = -EINVAL;
-                       break;
-               }
+               if (val < -128 || val > 127)
+                       return -EINVAL;
 
-               ret = mma8452_change_config(data,
-                                           MMA8452_OFF_X + chan->scan_index,
-                                           val);
-               break;
+               return mma8452_change_config(data,
+                                            MMA8452_OFF_X + chan->scan_index,
+                                            val);
 
        case IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY:
                if (val == 0 && val2 == 0) {
@@ -764,32 +754,38 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
                        data->data_cfg |= MMA8452_DATA_CFG_HPF_MASK;
                        ret = mma8452_set_hp_filter_frequency(data, val, val2);
                        if (ret < 0)
-                               break;
+                               return ret;
                }
 
-               ret = mma8452_change_config(data, MMA8452_DATA_CFG,
+               return mma8452_change_config(data, MMA8452_DATA_CFG,
                                             data->data_cfg);
-               break;
 
        case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
                j = mma8452_get_odr_index(data);
 
                for (i = 0; i < ARRAY_SIZE(mma8452_os_ratio); i++) {
-                       if (mma8452_os_ratio[i][j] == val) {
-                               ret = mma8452_set_power_mode(data, i);
-                               break;
-                       }
+                       if (mma8452_os_ratio[i][j] == val)
+                               return mma8452_set_power_mode(data, i);
                }
-               if (i == ARRAY_SIZE(mma8452_os_ratio)) {
-                       ret = -EINVAL;
-                       break;
-               }
-               break;
+
+               return -EINVAL;
+
        default:
-               ret = -EINVAL;
-               break;
+               return -EINVAL;
        }
+}
+
+static int mma8452_write_raw(struct iio_dev *indio_dev,
+                            struct iio_chan_spec const *chan,
+                            int val, int val2, long mask)
+{
+       int ret;
+
+       ret = iio_device_claim_direct_mode(indio_dev);
+       if (ret)
+               return ret;
 
+       ret = __mma8452_write_raw(indio_dev, chan, val, val2, mask);
        iio_device_release_direct_mode(indio_dev);
        return ret;
 }