]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iio: adc: ti-adc161s626: Stop using iio_device_claim_direct_scoped()
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 9 Feb 2025 18:06:15 +0000 (18:06 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 17 Feb 2025 13:02:16 +0000 (13:02 +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

Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250209180624.701140-19-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ti-adc161s626.c

index 474e733fb8e04691f1ee72eeb14ce76912227128..28aa6b80160c8b8dd2f35ff31c9a7d7d762eee1a 100644 (file)
@@ -137,13 +137,13 @@ static int ti_adc_read_raw(struct iio_dev *indio_dev,
 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {
-                       ret = ti_adc_read_measurement(data, chan, val);
-                       if (ret)
-                               return ret;
-                       return IIO_VAL_INT;
-               }
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+               ret = ti_adc_read_measurement(data, chan, val);
+               iio_device_release_direct(indio_dev);
+               if (ret)
+                       return ret;
+               return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
                ret = regulator_get_voltage(data->ref);
                if (ret < 0)