iio: imu: inv_icm42600: Convert to uXX and sXX integer types

The driver code is full of intXX_t and uintXX_t types which is
not the pattern we use in the IIO subsystem. Switch the driver
to use kernel internal types for that. No functional changes.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@tdk.com>
Link: https://patch.msgid.link/20250616090423.575736-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600.h b/drivers/iio/imu/inv_icm42600/inv_icm42600.h
index f893dbe6996506a33eb5d3be47e6765a923665c9..55ed1ddaa8cb5dd410d17db3866fa0f22f18e9d2 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600.h
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600.h
@@ -164,11 +164,11 @@ struct inv_icm42600_state {
        struct inv_icm42600_suspended suspended;
        struct iio_dev *indio_gyro;
        struct iio_dev *indio_accel;
-       uint8_t buffer[2] __aligned(IIO_DMA_MINALIGN);
+       u8 buffer[2] __aligned(IIO_DMA_MINALIGN);
        struct inv_icm42600_fifo fifo;
        struct {
-               int64_t gyro;
-               int64_t accel;
+               s64 gyro;
+               s64 accel;
        } timestamp;
 };
 
@@ -410,7 +410,7 @@ const struct iio_mount_matrix *
 inv_icm42600_get_mount_matrix(const struct iio_dev *indio_dev,
                              const struct iio_chan_spec *chan);
 
-uint32_t inv_icm42600_odr_to_period(enum inv_icm42600_odr odr);
+u32 inv_icm42600_odr_to_period(enum inv_icm42600_odr odr);
 
 int inv_icm42600_set_accel_conf(struct inv_icm42600_state *st,
                                struct inv_icm42600_sensor_conf *conf,

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
index dbd315ad3c4d2bd5085f7cd3cdc6de4391b1c896..8a6f09e68f4934b406939a72f66486f408f43a21 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
@@ -177,7 +177,7 @@ static const struct iio_chan_spec inv_icm42600_accel_channels[] = {
  */
 struct inv_icm42600_accel_buffer {
        struct inv_icm42600_fifo_sensor_data accel;
-       int16_t temp;
+       s16 temp;
        aligned_s64 timestamp;
 };
 
@@ -241,7 +241,7 @@ out_unlock:
 
 static int inv_icm42600_accel_read_sensor(struct iio_dev *indio_dev,
                                          struct iio_chan_spec const *chan,
-                                         int16_t *val)
+                                         s16 *val)
 {
        struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
        struct inv_icm42600_sensor_state *accel_st = iio_priv(indio_dev);
@@ -284,7 +284,7 @@ static int inv_icm42600_accel_read_sensor(struct iio_dev *indio_dev,
        if (ret)
                goto exit;
 
-       *val = (int16_t)be16_to_cpup(data);
+       *val = (s16)be16_to_cpup(data);
        if (*val == INV_ICM42600_DATA_INVALID)
                ret = -EINVAL;
 exit:
@@ -492,11 +492,11 @@ static int inv_icm42600_accel_read_offset(struct inv_icm42600_state *st,
                                          int *val, int *val2)
 {
        struct device *dev = regmap_get_device(st->map);
-       int64_t val64;
-       int32_t bias;
+       s64 val64;
+       s32 bias;
        unsigned int reg;
-       int16_t offset;
-       uint8_t data[2];
+       s16 offset;
+       u8 data[2];
        int ret;
 
        if (chan->type != IIO_ACCEL)
@@ -550,7 +550,7 @@ static int inv_icm42600_accel_read_offset(struct inv_icm42600_state *st,
         * result in micro (1000000)
         * (offset * 5 * 9.806650 * 1000000) / 10000
         */
-       val64 = (int64_t)offset * 5LL * 9806650LL;
+       val64 = (s64)offset * 5LL * 9806650LL;
        /* for rounding, add + or - divisor (10000) divided by 2 */
        if (val64 >= 0)
                val64 += 10000LL / 2LL;
@@ -568,10 +568,10 @@ static int inv_icm42600_accel_write_offset(struct inv_icm42600_state *st,
                                           int val, int val2)
 {
        struct device *dev = regmap_get_device(st->map);
-       int64_t val64;
-       int32_t min, max;
+       s64 val64;
+       s32 min, max;
        unsigned int reg, regval;
-       int16_t offset;
+       s16 offset;
        int ret;
 
        if (chan->type != IIO_ACCEL)
@@ -596,7 +596,7 @@ static int inv_icm42600_accel_write_offset(struct inv_icm42600_state *st,
              inv_icm42600_accel_calibbias[1];
        max = inv_icm42600_accel_calibbias[4] * 1000000L +
              inv_icm42600_accel_calibbias[5];
-       val64 = (int64_t)val * 1000000LL + (int64_t)val2;
+       val64 = (s64)val * 1000000LL + (s64)val2;
        if (val64 < min || val64 > max)
                return -EINVAL;
 
@@ -671,7 +671,7 @@ static int inv_icm42600_accel_read_raw(struct iio_dev *indio_dev,
                                       int *val, int *val2, long mask)
 {
        struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
-       int16_t data;
+       s16 data;
        int ret;
 
        switch (chan->type) {

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
index aae7c56481a3fa4351e921fb98ce61d31d1d7d6a..00b9db52ca785589cedf1c90a857c2f420e18995 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
@@ -26,28 +26,28 @@
 #define INV_ICM42600_FIFO_HEADER_ODR_GYRO      BIT(0)
 
 struct inv_icm42600_fifo_1sensor_packet {
-       uint8_t header;
+       u8 header;
        struct inv_icm42600_fifo_sensor_data data;
-       int8_t temp;
+       s8 temp;
 } __packed;
 #define INV_ICM42600_FIFO_1SENSOR_PACKET_SIZE          8
 
 struct inv_icm42600_fifo_2sensors_packet {
-       uint8_t header;
+       u8 header;
        struct inv_icm42600_fifo_sensor_data accel;
        struct inv_icm42600_fifo_sensor_data gyro;
-       int8_t temp;
+       s8 temp;
        __be16 timestamp;
 } __packed;
 #define INV_ICM42600_FIFO_2SENSORS_PACKET_SIZE         16
 
 ssize_t inv_icm42600_fifo_decode_packet(const void *packet, const void **accel,
-                                       const void **gyro, const int8_t **temp,
+                                       const void **gyro, const s8 **temp,
                                        const void **timestamp, unsigned int *odr)
 {
        const struct inv_icm42600_fifo_1sensor_packet *pack1 = packet;
        const struct inv_icm42600_fifo_2sensors_packet *pack2 = packet;
-       uint8_t header = *((const uint8_t *)packet);
+       u8 header = *((const u8 *)packet);
 
        /* FIFO empty */
        if (header & INV_ICM42600_FIFO_HEADER_MSG) {
@@ -100,7 +100,7 @@ ssize_t inv_icm42600_fifo_decode_packet(const void *packet, const void **accel,
 
 void inv_icm42600_buffer_update_fifo_period(struct inv_icm42600_state *st)
 {
-       uint32_t period_gyro, period_accel, period;
+       u32 period_gyro, period_accel, period;
 
        if (st->fifo.en & INV_ICM42600_SENSOR_GYRO)
                period_gyro = inv_icm42600_odr_to_period(st->conf.gyro.odr);
@@ -204,8 +204,8 @@ int inv_icm42600_buffer_update_watermark(struct inv_icm42600_state *st)
 {
        size_t packet_size, wm_size;
        unsigned int wm_gyro, wm_accel, watermark;
-       uint32_t period_gyro, period_accel, period;
-       uint32_t latency_gyro, latency_accel, latency;
+       u32 period_gyro, period_accel, period;
+       u32 latency_gyro, latency_accel, latency;
        bool restore;
        __le16 raw_wm;
        int ret;
@@ -459,7 +459,7 @@ int inv_icm42600_buffer_fifo_read(struct inv_icm42600_state *st,
        __be16 *raw_fifo_count;
        ssize_t i, size;
        const void *accel, *gyro, *timestamp;
-       const int8_t *temp;
+       const s8 *temp;
        unsigned int odr;
        int ret;
 
@@ -550,7 +550,7 @@ int inv_icm42600_buffer_hwfifo_flush(struct inv_icm42600_state *st,
        struct inv_icm42600_sensor_state *gyro_st = iio_priv(st->indio_gyro);
        struct inv_icm42600_sensor_state *accel_st = iio_priv(st->indio_accel);
        struct inv_sensors_timestamp *ts;
-       int64_t gyro_ts, accel_ts;
+       s64 gyro_ts, accel_ts;
        int ret;
 
        gyro_ts = iio_get_time_ns(st->indio_gyro);

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h
index f6c85daf42b00bfb7b1ccabd59195819088e3dc7..ffca4da1e249364c75fff12bdba68c8429420129 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h
@@ -28,7 +28,7 @@ struct inv_icm42600_state;
 struct inv_icm42600_fifo {
        unsigned int on;
        unsigned int en;
-       uint32_t period;
+       u32 period;
        struct {
                unsigned int gyro;
                unsigned int accel;
@@ -41,7 +41,7 @@ struct inv_icm42600_fifo {
                size_t accel;
                size_t total;
        } nb;
-       uint8_t data[2080] __aligned(IIO_DMA_MINALIGN);
+       u8 data[2080] __aligned(IIO_DMA_MINALIGN);
 };
 
 /* FIFO data packet */
@@ -52,7 +52,7 @@ struct inv_icm42600_fifo_sensor_data {
 } __packed;
 #define INV_ICM42600_FIFO_DATA_INVALID         -32768
 
-static inline int16_t inv_icm42600_fifo_get_sensor_data(__be16 d)
+static inline s16 inv_icm42600_fifo_get_sensor_data(__be16 d)
 {
        return be16_to_cpu(d);
 }
@@ -60,7 +60,7 @@ static inline int16_t inv_icm42600_fifo_get_sensor_data(__be16 d)
 static inline bool
 inv_icm42600_fifo_is_data_valid(const struct inv_icm42600_fifo_sensor_data *s)
 {
-       int16_t x, y, z;
+       s16 x, y, z;
 
        x = inv_icm42600_fifo_get_sensor_data(s->x);
        y = inv_icm42600_fifo_get_sensor_data(s->y);
@@ -75,7 +75,7 @@ inv_icm42600_fifo_is_data_valid(const struct inv_icm42600_fifo_sensor_data *s)
 }
 
 ssize_t inv_icm42600_fifo_decode_packet(const void *packet, const void **accel,
-                                       const void **gyro, const int8_t **temp,
+                                       const void **gyro, const s8 **temp,
                                        const void **timestamp, unsigned int *odr);
 
 extern const struct iio_buffer_setup_ops inv_icm42600_buffer_ops;

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
index 1fc4fddc2029bd0f3bf9cb8c4a77f86e9667058a..a32236c78375df24697026cae1c924f7471af916 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
@@ -103,7 +103,7 @@ const struct regmap_config inv_icm42600_spi_regmap_config = {
 EXPORT_SYMBOL_NS_GPL(inv_icm42600_spi_regmap_config, "IIO_ICM42600");
 
 struct inv_icm42600_hw {
-       uint8_t whoami;
+       u8 whoami;
        const char *name;
        const struct inv_icm42600_conf *conf;
 };
@@ -188,9 +188,9 @@ inv_icm42600_get_mount_matrix(const struct iio_dev *indio_dev,
        return &st->orientation;
 }
 
-uint32_t inv_icm42600_odr_to_period(enum inv_icm42600_odr odr)
+u32 inv_icm42600_odr_to_period(enum inv_icm42600_odr odr)
 {
-       static uint32_t odr_periods[INV_ICM42600_ODR_NB] = {
+       static u32 odr_periods[INV_ICM42600_ODR_NB] = {
                /* reserved values */
                0, 0, 0,
                /* 8kHz */

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
index 4058eca076d8b03a2290535eedffa0a74098d739..9ba6f13628e6af5e19d047476ae93754f07aa95f 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
@@ -77,7 +77,7 @@ static const struct iio_chan_spec inv_icm42600_gyro_channels[] = {
  */
 struct inv_icm42600_gyro_buffer {
        struct inv_icm42600_fifo_sensor_data gyro;
-       int16_t temp;
+       s16 temp;
        aligned_s64 timestamp;
 };
 
@@ -139,7 +139,7 @@ out_unlock:
 
 static int inv_icm42600_gyro_read_sensor(struct inv_icm42600_state *st,
                                         struct iio_chan_spec const *chan,
-                                        int16_t *val)
+                                        s16 *val)
 {
        struct device *dev = regmap_get_device(st->map);
        struct inv_icm42600_sensor_conf conf = INV_ICM42600_SENSOR_CONF_INIT;
@@ -179,7 +179,7 @@ static int inv_icm42600_gyro_read_sensor(struct inv_icm42600_state *st,
        if (ret)
                goto exit;
 
-       *val = (int16_t)be16_to_cpup(data);
+       *val = (s16)be16_to_cpup(data);
        if (*val == INV_ICM42600_DATA_INVALID)
                ret = -EINVAL;
 exit:
@@ -399,11 +399,11 @@ static int inv_icm42600_gyro_read_offset(struct inv_icm42600_state *st,
                                         int *val, int *val2)
 {
        struct device *dev = regmap_get_device(st->map);
-       int64_t val64;
-       int32_t bias;
+       s64 val64;
+       s32 bias;
        unsigned int reg;
-       int16_t offset;
-       uint8_t data[2];
+       s16 offset;
+       u8 data[2];
        int ret;
 
        if (chan->type != IIO_ANGL_VEL)
@@ -457,7 +457,7 @@ static int inv_icm42600_gyro_read_offset(struct inv_icm42600_state *st,
         * result in nano (1000000000)
         * (offset * 64 * Pi * 1000000000) / (2048 * 180)
         */
-       val64 = (int64_t)offset * 64LL * 3141592653LL;
+       val64 = (s64)offset * 64LL * 3141592653LL;
        /* for rounding, add + or - divisor (2048 * 180) divided by 2 */
        if (val64 >= 0)
                val64 += 2048 * 180 / 2;
@@ -475,9 +475,9 @@ static int inv_icm42600_gyro_write_offset(struct inv_icm42600_state *st,
                                          int val, int val2)
 {
        struct device *dev = regmap_get_device(st->map);
-       int64_t val64, min, max;
+       s64 val64, min, max;
        unsigned int reg, regval;
-       int16_t offset;
+       s16 offset;
        int ret;
 
        if (chan->type != IIO_ANGL_VEL)
@@ -498,11 +498,11 @@ static int inv_icm42600_gyro_write_offset(struct inv_icm42600_state *st,
        }
 
        /* inv_icm42600_gyro_calibbias: min - step - max in nano */
-       min = (int64_t)inv_icm42600_gyro_calibbias[0] * 1000000000LL +
-             (int64_t)inv_icm42600_gyro_calibbias[1];
-       max = (int64_t)inv_icm42600_gyro_calibbias[4] * 1000000000LL +
-             (int64_t)inv_icm42600_gyro_calibbias[5];
-       val64 = (int64_t)val * 1000000000LL + (int64_t)val2;
+       min = (s64)inv_icm42600_gyro_calibbias[0] * 1000000000LL +
+             (s64)inv_icm42600_gyro_calibbias[1];
+       max = (s64)inv_icm42600_gyro_calibbias[4] * 1000000000LL +
+             (s64)inv_icm42600_gyro_calibbias[5];
+       val64 = (s64)val * 1000000000LL + (s64)val2;
        if (val64 < min || val64 > max)
                return -EINVAL;
 
@@ -577,7 +577,7 @@ static int inv_icm42600_gyro_read_raw(struct iio_dev *indio_dev,
                                      int *val, int *val2, long mask)
 {
        struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
-       int16_t data;
+       s16 data;
        int ret;
 
        switch (chan->type) {
@@ -803,9 +803,9 @@ int inv_icm42600_gyro_parse_fifo(struct iio_dev *indio_dev)
        ssize_t i, size;
        unsigned int no;
        const void *accel, *gyro, *timestamp;
-       const int8_t *temp;
+       const s8 *temp;
        unsigned int odr;
-       int64_t ts_val;
+       s64 ts_val;
        /* buffer is copied to userspace, zeroing it to avoid any data leak */
        struct inv_icm42600_gyro_buffer buffer = { };
 

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
index 988f227f6563dadfd935ecbac259802f534c2b3a..8b15afca498cb5dfa7e056a60d3c78e419f11b29 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
@@ -13,7 +13,7 @@
 #include "inv_icm42600.h"
 #include "inv_icm42600_temp.h"
 
-static int inv_icm42600_temp_read(struct inv_icm42600_state *st, int16_t *temp)
+static int inv_icm42600_temp_read(struct inv_icm42600_state *st, s16 *temp)
 {
        struct device *dev = regmap_get_device(st->map);
        __be16 *raw;
@@ -31,7 +31,7 @@ static int inv_icm42600_temp_read(struct inv_icm42600_state *st, int16_t *temp)
        if (ret)
                goto exit;
 
-       *temp = (int16_t)be16_to_cpup(raw);
+       *temp = (s16)be16_to_cpup(raw);
        if (*temp == INV_ICM42600_DATA_INVALID)
                ret = -EINVAL;
 
@@ -48,7 +48,7 @@ int inv_icm42600_temp_read_raw(struct iio_dev *indio_dev,
                               int *val, int *val2, long mask)
 {
        struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
-       int16_t temp;
+       s16 temp;
        int ret;
 
        if (chan->type != IIO_TEMP)