]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iio: dac: ad3552r-hs: Stop using iio_device_claim_direct_scoped()
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 9 Feb 2025 18:06:19 +0000 (18:06 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 17 Feb 2025 13:03:04 +0000 (13:03 +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: Angelo Dureghello <adureghello@baylibre.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20250209180624.701140-23-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/dac/ad3552r-hs.c

index c1dae58c19754206346076cc59ece856d8637203..cd8dabb60c5548780f0fce5d1b68c494cd71321d 100644 (file)
@@ -129,16 +129,19 @@ static int ad3552r_hs_write_raw(struct iio_dev *indio_dev,
                                int val, int val2, long mask)
 {
        struct ad3552r_hs_state *st = iio_priv(indio_dev);
+       int ret;
 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
                /* For RAW accesses, stay always in simple-spi. */
-               iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {
-                       return st->data->bus_reg_write(st->back,
-                                   AD3552R_REG_ADDR_CH_DAC_16B(chan->channel),
-                                   val, 2);
-               }
-               unreachable();
+               ret = st->data->bus_reg_write(st->back,
+                       AD3552R_REG_ADDR_CH_DAC_16B(chan->channel),
+                       val, 2);
+
+               iio_device_release_direct(indio_dev);
+               return ret;
        default:
                return -EINVAL;
        }