iio: accel: Switch to sparse friendly iio_device_claim/release_direct()

Single patch for the simple cases in accelerometer drivers.

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.

Cc: Antoniu Miclaus <antoniu.miclaus@analog.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250217140135.896574-9-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/adxl372.c b/drivers/iio/accel/adxl372.c
index 8ba5fbe6e1f50f634d2cc74d64dd427f37ade345..961145b502934674e7655573b12121fffb2328db 100644 (file)
--- a/drivers/iio/accel/adxl372.c
+++ b/drivers/iio/accel/adxl372.c
@@ -763,12 +763,11 @@ static int adxl372_read_raw(struct iio_dev *indio_dev,
 
        switch (info) {
        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 = adxl372_read_axis(st, chan->address);
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
                if (ret < 0)
                        return ret;
 

diff --git a/drivers/iio/accel/adxl380.c b/drivers/iio/accel/adxl380.c
index 90340f134722a3bd852d4daebab7b7c9e855f94b..0cf3c68158293c17ebb14bbfbbce64c4c35c09d0 100644 (file)
--- a/drivers/iio/accel/adxl380.c
+++ b/drivers/iio/accel/adxl380.c
@@ -1175,12 +1175,11 @@ static int adxl380_read_raw(struct iio_dev *indio_dev,
 
        switch (info) {
        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 = adxl380_read_chn(st, chan->address);
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
                if (ret < 0)
                        return ret;
 

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 128db14ba726a3ada82a43cfcea04c8fc1bfee76..aa664a923f916004eb00560006365c3775cd89ba 100644 (file)
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -540,14 +540,13 @@ static int bma180_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;
 
                mutex_lock(&data->mutex);
                ret = bma180_get_data_reg(data, chan->scan_index);
                mutex_unlock(&data->mutex);
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
                if (ret < 0)
                        return ret;
                if (chan->scan_type.sign == 's') {

diff --git a/drivers/iio/accel/bmi088-accel-core.c b/drivers/iio/accel/bmi088-accel-core.c
index 36e5d06ffd3370816763e6e87a21afff6ae12e73..dea126f993c1666a42f62a1f311b58c864349c89 100644 (file)
--- a/drivers/iio/accel/bmi088-accel-core.c
+++ b/drivers/iio/accel/bmi088-accel-core.c
@@ -313,12 +313,13 @@ static int bmi088_accel_read_raw(struct iio_dev *indio_dev,
                        if (ret)
                                return ret;
 
-                       ret = iio_device_claim_direct_mode(indio_dev);
-                       if (ret)
+                       if (!iio_device_claim_direct(indio_dev)) {
+                               ret = -EBUSY;
                                goto out_read_raw_pm_put;
+                       }
 
                        ret = bmi088_accel_get_axis(data, chan, val);
-                       iio_device_release_direct_mode(indio_dev);
+                       iio_device_release_direct(indio_dev);
                        if (!ret)
                                ret = IIO_VAL_INT;
 

diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
index 987212a7c038ec00cbbd0d3d96af80cf3a94e949..48e4282964a0698d422df49739365648e19bdef6 100644 (file)
--- a/drivers/iio/accel/fxls8962af-core.c
+++ b/drivers/iio/accel/fxls8962af-core.c
@@ -460,22 +460,20 @@ static int fxls8962af_write_raw(struct iio_dev *indio_dev,
                if (val != 0)
                        return -EINVAL;
 
-               ret = iio_device_claim_direct_mode(indio_dev);
-               if (ret)
-                       return ret;
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
 
                ret = fxls8962af_set_full_scale(data, val2);
 
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
                return ret;
        case IIO_CHAN_INFO_SAMP_FREQ:
-               ret = iio_device_claim_direct_mode(indio_dev);
-               if (ret)
-                       return ret;
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
 
                ret = fxls8962af_set_samp_freq(data, val, val2);
 
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
                return ret;
        default:
                return -EINVAL;
@@ -683,14 +681,13 @@ fxls8962af_write_event_config(struct iio_dev *indio_dev,
                fxls8962af_active(data);
                ret = fxls8962af_power_on(data);
        } else {
-               ret = iio_device_claim_direct_mode(indio_dev);
-               if (ret)
-                       return ret;
+               if (!iio_device_claim_direct(indio_dev))
+                       return -EBUSY;
 
                /* Not in buffered mode so disable power */
                ret = fxls8962af_power_off(data);
 
-               iio_device_release_direct_mode(indio_dev);
+               iio_device_release_direct(indio_dev);
        }
 
        return ret;