]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
iio: common: ssp_sensors: drop conditional optimization for simplicity
authorVasileios Amoiridis <vassilisamir@gmail.com>
Sat, 14 Dec 2024 19:14:20 +0000 (20:14 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 28 Dec 2024 14:28:13 +0000 (14:28 +0000)
Drop conditional in favor of always calculating the timestamp value.
This simplifies the code and allows to drop usage of internal private
variable "scan_timestamp" of the struct iio_dev.

Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
Link: https://patch.msgid.link/20241214191421.94172-4-vassilisamir@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/common/ssp_sensors/ssp_iio.c

index caa404edd9d045859a4f39bed5b8d70715770430..78ac689de2fedee3fd34bef4c527deac03cbaa27 100644 (file)
@@ -8,6 +8,8 @@
 #include <linux/iio/kfifo_buf.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/unaligned.h>
+#include <linux/units.h>
 #include "ssp_iio_sensor.h"
 
 /**
@@ -70,8 +72,7 @@ EXPORT_SYMBOL_NS(ssp_common_buffer_postdisable, "IIO_SSP_SENSORS");
 int ssp_common_process_data(struct iio_dev *indio_dev, void *buf,
                            unsigned int len, int64_t timestamp)
 {
-       __le32 time;
-       int64_t calculated_time = 0;
+       int64_t calculated_time;
        struct ssp_sensor_data *spd = iio_priv(indio_dev);
 
        if (indio_dev->scan_bytes == 0)
@@ -82,11 +83,8 @@ int ssp_common_process_data(struct iio_dev *indio_dev, void *buf,
         */
        memcpy(spd->buffer, buf, len);
 
-       if (indio_dev->scan_timestamp) {
-               memcpy(&time, &((char *)buf)[len], SSP_TIME_SIZE);
-               calculated_time =
-                       timestamp + (int64_t)le32_to_cpu(time) * 1000000;
-       }
+       calculated_time = timestamp +
+               (int64_t)get_unaligned_le32(buf + len) * MEGA;
 
        return iio_push_to_buffers_with_timestamp(indio_dev, spd->buffer,
                                                  calculated_time);