iio: proximity: sx9310: 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.

Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250209180624.701140-6-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
index 0d7f0518d4fb952cc883d0f3959b6c777a616f01..b60707eba39d05d3ad44dc9789d658ea68379f9d 100644 (file)
--- a/drivers/iio/proximity/sx9310.c
+++ b/drivers/iio/proximity/sx9310.c
@@ -337,19 +337,26 @@ static int sx9310_read_raw(struct iio_dev *indio_dev,
                           int *val2, long mask)
 {
        struct sx_common_data *data = iio_priv(indio_dev);
+       int ret;
 
        if (chan->type != IIO_PROXIMITY)
                return -EINVAL;
 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev)
-                       return sx_common_read_proximity(data, chan, val);
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+
+               ret = sx_common_read_proximity(data, chan, val);
+               iio_device_release_direct(indio_dev);
+               return ret;
        case IIO_CHAN_INFO_HARDWAREGAIN:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev)
-                       return sx9310_read_gain(data, chan, val);
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+
+               ret = sx9310_read_gain(data, chan, val);
+               iio_device_release_direct(indio_dev);
+               return ret;
        case IIO_CHAN_INFO_SAMP_FREQ:
                return sx9310_read_samp_freq(data, val, val2);
        default: