iio: adc: ti-ads1119: 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: João Paulo Gonçalves <joao.goncalves@toradex.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250209180624.701140-20-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/ti-ads1119.c b/drivers/iio/adc/ti-ads1119.c
index de019b3faa48152b3bfc251c38205758fcf35e91..f120e7e21cff5fc465744679ebd18047c79d7a8c 100644 (file)
--- a/drivers/iio/adc/ti-ads1119.c
+++ b/drivers/iio/adc/ti-ads1119.c
@@ -336,19 +336,24 @@ static int ads1119_read_raw(struct iio_dev *indio_dev,
 {
        struct ads1119_state *st = iio_priv(indio_dev);
        unsigned int index = chan->address;
+       int ret;
 
        if (index >= st->num_channels_cfg)
                return -EINVAL;
 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev)
-                       return ads1119_single_conversion(st, chan, val, false);
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+               ret = ads1119_single_conversion(st, chan, val, false);
+               iio_device_release_direct(indio_dev);
+               return ret;
        case IIO_CHAN_INFO_OFFSET:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev)
-                       return ads1119_single_conversion(st, chan, val, true);
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+               ret = ads1119_single_conversion(st, chan, val, true);
+               iio_device_release_direct(indio_dev);
+               return ret;
        case IIO_CHAN_INFO_SCALE:
                *val = st->vref_uV / 1000;
                *val /= st->channels_cfg[index].gain;