iio: imu: bmi323: Stop using iio_device_claim_direct_scoped()

This complex cleanup.h use case of conditional guards has proved
to be more trouble that it is worth in terms of false positive compiler
warnings and hard to read code.

Move directly to the new claim/release_direct() that allow sparse
to check for unbalanced context.

Cc: Julien Stephan <jstephan@baylibre.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250209180624.701140-26-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/imu/bmi323/bmi323_core.c b/drivers/iio/imu/bmi323/bmi323_core.c
index 7f386c5e58b46d0bded452dcdde28667ee4402fa..fc54d464a3ae96d390369f10b810d31bece93e5e 100644 (file)
--- a/drivers/iio/imu/bmi323/bmi323_core.c
+++ b/drivers/iio/imu/bmi323/bmi323_core.c
@@ -1702,26 +1702,30 @@ static int bmi323_write_raw(struct iio_dev *indio_dev,
                            int val2, long mask)
 {
        struct bmi323_data *data = iio_priv(indio_dev);
+       int ret;
 
        switch (mask) {
        case IIO_CHAN_INFO_SAMP_FREQ:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev)
-                       return bmi323_set_odr(data,
-                                             bmi323_iio_to_sensor(chan->type),
-                                             val, val2);
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+               ret = bmi323_set_odr(data, bmi323_iio_to_sensor(chan->type),
+                                    val, val2);
+               iio_device_release_direct(indio_dev);
+               return ret;
        case IIO_CHAN_INFO_SCALE:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev)
-                       return bmi323_set_scale(data,
-                                               bmi323_iio_to_sensor(chan->type),
-                                               val, val2);
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+               ret = bmi323_set_scale(data, bmi323_iio_to_sensor(chan->type),
+                                      val, val2);
+               iio_device_release_direct(indio_dev);
+               return ret;
        case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev)
-                       return bmi323_set_average(data,
-                                                 bmi323_iio_to_sensor(chan->type),
-                                                 val);
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+               ret = bmi323_set_average(data, bmi323_iio_to_sensor(chan->type),
+                                        val);
+               iio_device_release_direct(indio_dev);
+               return ret;
        case IIO_CHAN_INFO_ENABLE:
                return bmi323_enable_steps(data, val);
        case IIO_CHAN_INFO_PROCESSED: {
@@ -1747,6 +1751,7 @@ static int bmi323_read_raw(struct iio_dev *indio_dev,
                           int *val2, long mask)
 {
        struct bmi323_data *data = iio_priv(indio_dev);
+       int ret;
 
        switch (mask) {
        case IIO_CHAN_INFO_PROCESSED:
@@ -1755,10 +1760,11 @@ static int bmi323_read_raw(struct iio_dev *indio_dev,
                switch (chan->type) {
                case IIO_ACCEL:
                case IIO_ANGL_VEL:
-                       iio_device_claim_direct_scoped(return -EBUSY,
-                                                      indio_dev)
-                               return bmi323_read_axis(data, chan, val);
-                       unreachable();
+                       if (!iio_device_claim_direct(indio_dev))
+                               return -EBUSY;
+                       ret = bmi323_read_axis(data, chan, val);
+                       iio_device_release_direct(indio_dev);
+                       return ret;
                case IIO_TEMP:
                        return bmi323_get_temp_data(data, val);
                default: