]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: imu: inv_icm42600: delete unneeded update watermark call
authorJean-Baptiste Maneyrol <jean-baptiste.maneyrol@tdk.com>
Mon, 27 May 2024 21:00:08 +0000 (21:00 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Jun 2024 12:40:28 +0000 (14:40 +0200)
commit 245f3b149e6cc3ac6ee612cdb7042263bfc9e73c upstream.

Update watermark will be done inside the hwfifo_set_watermark callback
just after the update_scan_mode. It is useless to do it here.

Fixes: 7f85e42a6c54 ("iio: imu: inv_icm42600: add buffer support in iio devices")
Cc: stable@vger.kernel.org
Signed-off-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@tdk.com>
Link: https://lore.kernel.org/r/20240527210008.612932-1-inv.git-commit@tdk.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c

index f67bd5a39beb3441114ec5f500bf0bd086917872..6d9cb010f628bb4f5b53aec333314f02f1a4864e 100644 (file)
@@ -129,10 +129,6 @@ static int inv_icm42600_accel_update_scan_mode(struct iio_dev *indio_dev,
        /* update data FIFO write */
        inv_sensors_timestamp_apply_odr(ts, 0, 0, 0);
        ret = inv_icm42600_buffer_set_fifo_en(st, fifo_en | st->fifo.en);
-       if (ret)
-               goto out_unlock;
-
-       ret = inv_icm42600_buffer_update_watermark(st);
 
 out_unlock:
        mutex_unlock(&st->lock);
index 3df0a715e8856039fc185f69ed193ae9dcbabb0a..fc80b4a97fda82c4e83a000c9bf2844e5c654b91 100644 (file)
@@ -129,10 +129,6 @@ static int inv_icm42600_gyro_update_scan_mode(struct iio_dev *indio_dev,
        /* update data FIFO write */
        inv_sensors_timestamp_apply_odr(ts, 0, 0, 0);
        ret = inv_icm42600_buffer_set_fifo_en(st, fifo_en | st->fifo.en);
-       if (ret)
-               goto out_unlock;
-
-       ret = inv_icm42600_buffer_update_watermark(st);
 
 out_unlock:
        mutex_unlock(&st->lock);