]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iio: adc: ad7606: Stop using iio_device_claim_direct_scoped()
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 9 Feb 2025 18:06:09 +0000 (18:06 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 17 Feb 2025 13:00:58 +0000 (13:00 +0000)
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: Guillaume Stols <gstols@baylibre.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20250209180624.701140-13-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ad7606.c

index 612fe73396d74740d0dd2b671da4eb88e2aa69d0..1e8b03a518b8b4e61611314791ba5f82655befe8 100644 (file)
@@ -762,13 +762,13 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
 
        switch (m) {
        case IIO_CHAN_INFO_RAW:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {
-                       ret = ad7606_scan_direct(indio_dev, chan->address, val);
-                       if (ret < 0)
-                               return ret;
-                       return IIO_VAL_INT;
-               }
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+               ret = ad7606_scan_direct(indio_dev, chan->address, val);
+               iio_device_release_direct(indio_dev);
+               if (ret < 0)
+                       return ret;
+               return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
                if (st->sw_mode_en)
                        ch = chan->address;