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

index adb4e25dd7ea65f0094b024d595951ebc93488c3..0466c0c7eae4c0915ff07bdde79f2d94a8ba9c8b 100644 (file)
@@ -248,12 +248,15 @@ static int ad7625_write_raw(struct iio_dev *indio_dev,
                            int val, int val2, long info)
 {
        struct ad7625_state *st = iio_priv(indio_dev);
+       int ret;
 
        switch (info) {
        case IIO_CHAN_INFO_SAMP_FREQ:
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev)
-                       return ad7625_set_sampling_freq(st, val);
-               unreachable();
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
+               ret = ad7625_set_sampling_freq(st, val);
+               iio_device_release_direct(indio_dev);
+               return ret;
        default:
                return -EINVAL;
        }