]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iio: adc: at91-sama5d2: Switch to sparse friendly iio_device_claim/release_direct()
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 17 Feb 2025 14:16:22 +0000 (14:16 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 4 Mar 2025 13:17:50 +0000 (13:17 +0000)
These new functions allow sparse to find failures to release
direct mode reducing chances of bugs over the claim_direct_mode()
functions that are deprecated.

Reviewed-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Link: https://patch.msgid.link/20250217141630.897334-23-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/at91-sama5d2_adc.c

index 70d3dbb39b2561b4d0c45ba8118daf0f6ea527bf..694ff96fc913d96d1e637c74465af9096cc498f6 100644 (file)
@@ -1914,12 +1914,11 @@ static int at91_adc_read_raw(struct iio_dev *indio_dev,
 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
-               ret = iio_device_claim_direct_mode(indio_dev);
-               if (ret)
-                       return ret;
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
 
                ret = at91_adc_read_info_locked(indio_dev, chan, val);
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
                return ret;
 
        case IIO_CHAN_INFO_SCALE:
@@ -1932,12 +1931,11 @@ static int at91_adc_read_raw(struct iio_dev *indio_dev,
        case IIO_CHAN_INFO_PROCESSED:
                if (chan->type != IIO_TEMP)
                        return -EINVAL;
-               ret = iio_device_claim_direct_mode(indio_dev);
-               if (ret)
-                       return ret;
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
 
                ret = at91_adc_read_temp(indio_dev, chan, val);
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
 
                return ret;
 
@@ -1967,28 +1965,26 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev,
                if (val == st->oversampling_ratio)
                        return 0;
 
-               ret = iio_device_claim_direct_mode(indio_dev);
-               if (ret)
-                       return ret;
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
                mutex_lock(&st->lock);
                /* update ratio */
                ret = at91_adc_config_emr(st, val, 0);
                mutex_unlock(&st->lock);
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
                return ret;
        case IIO_CHAN_INFO_SAMP_FREQ:
                if (val < st->soc_info.min_sample_rate ||
                    val > st->soc_info.max_sample_rate)
                        return -EINVAL;
 
-               ret = iio_device_claim_direct_mode(indio_dev);
-               if (ret)
-                       return ret;
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
                mutex_lock(&st->lock);
                at91_adc_setup_samp_freq(indio_dev, val,
                                         st->soc_info.startup_time, 0);
                mutex_unlock(&st->lock);
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
                return 0;
        default:
                return -EINVAL;