Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / iio / imu / inv_icm42600 / inv_icm42600_buffer.c

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
index 32d7f836423036851b33493ded7e12007eadb47d..6ef1df9d60b77de585b8cc30307a0d32576e2cb4 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
@@ -9,11 +9,12 @@
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/delay.h>
-#include <linux/iio/iio.h>
+
 #include <linux/iio/buffer.h>
+#include <linux/iio/common/inv_sensors_timestamp.h>
+#include <linux/iio/iio.h>
 
 #include "inv_icm42600.h"
-#include "inv_icm42600_timestamp.h"
 #include "inv_icm42600_buffer.h"
 
 /* FIFO header: 1 byte */
@@ -275,12 +276,12 @@ static int inv_icm42600_buffer_preenable(struct iio_dev *indio_dev)
 {
        struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
        struct device *dev = regmap_get_device(st->map);
-       struct inv_icm42600_timestamp *ts = iio_priv(indio_dev);
+       struct inv_sensors_timestamp *ts = iio_priv(indio_dev);
 
        pm_runtime_get_sync(dev);
 
        mutex_lock(&st->lock);
-       inv_icm42600_timestamp_reset(ts);
+       inv_sensors_timestamp_reset(ts);
        mutex_unlock(&st->lock);
 
        return 0;
@@ -504,7 +505,7 @@ int inv_icm42600_buffer_fifo_read(struct inv_icm42600_state *st,
 
 int inv_icm42600_buffer_fifo_parse(struct inv_icm42600_state *st)
 {
-       struct inv_icm42600_timestamp *ts;
+       struct inv_sensors_timestamp *ts;
        int ret;
 
        if (st->fifo.nb.total == 0)
@@ -512,8 +513,8 @@ int inv_icm42600_buffer_fifo_parse(struct inv_icm42600_state *st)
 
        /* handle gyroscope timestamp and FIFO data parsing */
        ts = iio_priv(st->indio_gyro);
-       inv_icm42600_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,
-                                        st->fifo.nb.gyro, st->timestamp.gyro);
+       inv_sensors_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,
+                                       st->fifo.nb.gyro, st->timestamp.gyro);
        if (st->fifo.nb.gyro > 0) {
                ret = inv_icm42600_gyro_parse_fifo(st->indio_gyro);
                if (ret)
@@ -522,8 +523,8 @@ int inv_icm42600_buffer_fifo_parse(struct inv_icm42600_state *st)
 
        /* handle accelerometer timestamp and FIFO data parsing */
        ts = iio_priv(st->indio_accel);
-       inv_icm42600_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,
-                                        st->fifo.nb.accel, st->timestamp.accel);
+       inv_sensors_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,
+                                       st->fifo.nb.accel, st->timestamp.accel);
        if (st->fifo.nb.accel > 0) {
                ret = inv_icm42600_accel_parse_fifo(st->indio_accel);
                if (ret)
@@ -536,7 +537,7 @@ int inv_icm42600_buffer_fifo_parse(struct inv_icm42600_state *st)
 int inv_icm42600_buffer_hwfifo_flush(struct inv_icm42600_state *st,
                                     unsigned int count)
 {
-       struct inv_icm42600_timestamp *ts;
+       struct inv_sensors_timestamp *ts;
        int64_t gyro_ts, accel_ts;
        int ret;
 
@@ -552,9 +553,9 @@ int inv_icm42600_buffer_hwfifo_flush(struct inv_icm42600_state *st,
 
        if (st->fifo.nb.gyro > 0) {
                ts = iio_priv(st->indio_gyro);
-               inv_icm42600_timestamp_interrupt(ts, st->fifo.period,
-                                                st->fifo.nb.total, st->fifo.nb.gyro,
-                                                gyro_ts);
+               inv_sensors_timestamp_interrupt(ts, st->fifo.period,
+                                               st->fifo.nb.total, st->fifo.nb.gyro,
+                                               gyro_ts);
                ret = inv_icm42600_gyro_parse_fifo(st->indio_gyro);
                if (ret)
                        return ret;
@@ -562,9 +563,9 @@ int inv_icm42600_buffer_hwfifo_flush(struct inv_icm42600_state *st,
 
        if (st->fifo.nb.accel > 0) {
                ts = iio_priv(st->indio_accel);
-               inv_icm42600_timestamp_interrupt(ts, st->fifo.period,
-                                                st->fifo.nb.total, st->fifo.nb.accel,
-                                                accel_ts);
+               inv_sensors_timestamp_interrupt(ts, st->fifo.period,
+                                               st->fifo.nb.total, st->fifo.nb.accel,
+                                               accel_ts);
                ret = inv_icm42600_accel_parse_fifo(st->indio_accel);
                if (ret)
                        return ret;