Skip to content

Commit 96abc49

Browse files
andy-shevgregkh
andy-shev
authored and
gregkh
committed
iio: imu: inv_icm42600: Convert to uXX and sXX integer types
[ Upstream commit a413538 ] 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> Stable-dep-of: dfdc31e ("iio: imu: inv_icm42600: change invalid data error to -EBUSY") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 22afdbd commit 96abc49

File tree

7 files changed

+57
-57
lines changed

7 files changed

+57
-57
lines changed

‎drivers/iio/imu/inv_icm42600/inv_icm42600.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ struct inv_icm42600_state {
164164
struct inv_icm42600_suspended suspended;
165165
struct iio_dev *indio_gyro;
166166
struct iio_dev *indio_accel;
167-
uint8_t buffer[2] __aligned(IIO_DMA_MINALIGN);
167+
u8 buffer[2] __aligned(IIO_DMA_MINALIGN);
168168
struct inv_icm42600_fifo fifo;
169169
struct {
170-
int64_t gyro;
171-
int64_t accel;
170+
s64 gyro;
171+
s64 accel;
172172
} timestamp;
173173
};
174174

@@ -410,7 +410,7 @@ const struct iio_mount_matrix *
410410
inv_icm42600_get_mount_matrix(const struct iio_dev *indio_dev,
411411
const struct iio_chan_spec *chan);
412412

413-
uint32_t inv_icm42600_odr_to_period(enum inv_icm42600_odr odr);
413+
u32 inv_icm42600_odr_to_period(enum inv_icm42600_odr odr);
414414

415415
int inv_icm42600_set_accel_conf(struct inv_icm42600_state *st,
416416
struct inv_icm42600_sensor_conf *conf,

‎drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static const struct iio_chan_spec inv_icm42600_accel_channels[] = {
177177
*/
178178
struct inv_icm42600_accel_buffer {
179179
struct inv_icm42600_fifo_sensor_data accel;
180-
int16_t temp;
180+
s16 temp;
181181
aligned_s64 timestamp;
182182
};
183183

@@ -241,7 +241,7 @@ static int inv_icm42600_accel_update_scan_mode(struct iio_dev *indio_dev,
241241

242242
static int inv_icm42600_accel_read_sensor(struct iio_dev *indio_dev,
243243
struct iio_chan_spec const *chan,
244-
int16_t *val)
244+
s16 *val)
245245
{
246246
struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
247247
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,
284284
if (ret)
285285
goto exit;
286286

287-
*val = (int16_t)be16_to_cpup(data);
287+
*val = (s16)be16_to_cpup(data);
288288
if (*val == INV_ICM42600_DATA_INVALID)
289289
ret = -EINVAL;
290290
exit:
@@ -492,11 +492,11 @@ static int inv_icm42600_accel_read_offset(struct inv_icm42600_state *st,
492492
int *val, int *val2)
493493
{
494494
struct device *dev = regmap_get_device(st->map);
495-
int64_t val64;
496-
int32_t bias;
495+
s64 val64;
496+
s32 bias;
497497
unsigned int reg;
498-
int16_t offset;
499-
uint8_t data[2];
498+
s16 offset;
499+
u8 data[2];
500500
int ret;
501501

502502
if (chan->type != IIO_ACCEL)
@@ -550,7 +550,7 @@ static int inv_icm42600_accel_read_offset(struct inv_icm42600_state *st,
550550
* result in micro (1000000)
551551
* (offset * 5 * 9.806650 * 1000000) / 10000
552552
*/
553-
val64 = (int64_t)offset * 5LL * 9806650LL;
553+
val64 = (s64)offset * 5LL * 9806650LL;
554554
/* for rounding, add + or - divisor (10000) divided by 2 */
555555
if (val64 >= 0)
556556
val64 += 10000LL / 2LL;
@@ -568,10 +568,10 @@ static int inv_icm42600_accel_write_offset(struct inv_icm42600_state *st,
568568
int val, int val2)
569569
{
570570
struct device *dev = regmap_get_device(st->map);
571-
int64_t val64;
572-
int32_t min, max;
571+
s64 val64;
572+
s32 min, max;
573573
unsigned int reg, regval;
574-
int16_t offset;
574+
s16 offset;
575575
int ret;
576576

577577
if (chan->type != IIO_ACCEL)
@@ -596,7 +596,7 @@ static int inv_icm42600_accel_write_offset(struct inv_icm42600_state *st,
596596
inv_icm42600_accel_calibbias[1];
597597
max = inv_icm42600_accel_calibbias[4] * 1000000L +
598598
inv_icm42600_accel_calibbias[5];
599-
val64 = (int64_t)val * 1000000LL + (int64_t)val2;
599+
val64 = (s64)val * 1000000LL + (s64)val2;
600600
if (val64 < min || val64 > max)
601601
return -EINVAL;
602602

@@ -671,7 +671,7 @@ static int inv_icm42600_accel_read_raw(struct iio_dev *indio_dev,
671671
int *val, int *val2, long mask)
672672
{
673673
struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
674-
int16_t data;
674+
s16 data;
675675
int ret;
676676

677677
switch (chan->type) {

‎drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@
2626
#define INV_ICM42600_FIFO_HEADER_ODR_GYRO BIT(0)
2727

2828
struct inv_icm42600_fifo_1sensor_packet {
29-
uint8_t header;
29+
u8 header;
3030
struct inv_icm42600_fifo_sensor_data data;
31-
int8_t temp;
31+
s8 temp;
3232
} __packed;
3333
#define INV_ICM42600_FIFO_1SENSOR_PACKET_SIZE 8
3434

3535
struct inv_icm42600_fifo_2sensors_packet {
36-
uint8_t header;
36+
u8 header;
3737
struct inv_icm42600_fifo_sensor_data accel;
3838
struct inv_icm42600_fifo_sensor_data gyro;
39-
int8_t temp;
39+
s8 temp;
4040
__be16 timestamp;
4141
} __packed;
4242
#define INV_ICM42600_FIFO_2SENSORS_PACKET_SIZE 16
4343

4444
ssize_t inv_icm42600_fifo_decode_packet(const void *packet, const void **accel,
45-
const void **gyro, const int8_t **temp,
45+
const void **gyro, const s8 **temp,
4646
const void **timestamp, unsigned int *odr)
4747
{
4848
const struct inv_icm42600_fifo_1sensor_packet *pack1 = packet;
4949
const struct inv_icm42600_fifo_2sensors_packet *pack2 = packet;
50-
uint8_t header = *((const uint8_t *)packet);
50+
u8 header = *((const u8 *)packet);
5151

5252
/* FIFO empty */
5353
if (header & INV_ICM42600_FIFO_HEADER_MSG) {
@@ -100,7 +100,7 @@ ssize_t inv_icm42600_fifo_decode_packet(const void *packet, const void **accel,
100100

101101
void inv_icm42600_buffer_update_fifo_period(struct inv_icm42600_state *st)
102102
{
103-
uint32_t period_gyro, period_accel, period;
103+
u32 period_gyro, period_accel, period;
104104

105105
if (st->fifo.en & INV_ICM42600_SENSOR_GYRO)
106106
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)
204204
{
205205
size_t packet_size, wm_size;
206206
unsigned int wm_gyro, wm_accel, watermark;
207-
uint32_t period_gyro, period_accel, period;
208-
uint32_t latency_gyro, latency_accel, latency;
207+
u32 period_gyro, period_accel, period;
208+
u32 latency_gyro, latency_accel, latency;
209209
bool restore;
210210
__le16 raw_wm;
211211
int ret;
@@ -459,7 +459,7 @@ int inv_icm42600_buffer_fifo_read(struct inv_icm42600_state *st,
459459
__be16 *raw_fifo_count;
460460
ssize_t i, size;
461461
const void *accel, *gyro, *timestamp;
462-
const int8_t *temp;
462+
const s8 *temp;
463463
unsigned int odr;
464464
int ret;
465465

@@ -550,7 +550,7 @@ int inv_icm42600_buffer_hwfifo_flush(struct inv_icm42600_state *st,
550550
struct inv_icm42600_sensor_state *gyro_st = iio_priv(st->indio_gyro);
551551
struct inv_icm42600_sensor_state *accel_st = iio_priv(st->indio_accel);
552552
struct inv_sensors_timestamp *ts;
553-
int64_t gyro_ts, accel_ts;
553+
s64 gyro_ts, accel_ts;
554554
int ret;
555555

556556
gyro_ts = iio_get_time_ns(st->indio_gyro);

‎drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct inv_icm42600_state;
2828
struct inv_icm42600_fifo {
2929
unsigned int on;
3030
unsigned int en;
31-
uint32_t period;
31+
u32 period;
3232
struct {
3333
unsigned int gyro;
3434
unsigned int accel;
@@ -41,7 +41,7 @@ struct inv_icm42600_fifo {
4141
size_t accel;
4242
size_t total;
4343
} nb;
44-
uint8_t data[2080] __aligned(IIO_DMA_MINALIGN);
44+
u8 data[2080] __aligned(IIO_DMA_MINALIGN);
4545
};
4646

4747
/* FIFO data packet */
@@ -52,15 +52,15 @@ struct inv_icm42600_fifo_sensor_data {
5252
} __packed;
5353
#define INV_ICM42600_FIFO_DATA_INVALID -32768
5454

55-
static inline int16_t inv_icm42600_fifo_get_sensor_data(__be16 d)
55+
static inline s16 inv_icm42600_fifo_get_sensor_data(__be16 d)
5656
{
5757
return be16_to_cpu(d);
5858
}
5959

6060
static inline bool
6161
inv_icm42600_fifo_is_data_valid(const struct inv_icm42600_fifo_sensor_data *s)
6262
{
63-
int16_t x, y, z;
63+
s16 x, y, z;
6464

6565
x = inv_icm42600_fifo_get_sensor_data(s->x);
6666
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)
7575
}
7676

7777
ssize_t inv_icm42600_fifo_decode_packet(const void *packet, const void **accel,
78-
const void **gyro, const int8_t **temp,
78+
const void **gyro, const s8 **temp,
7979
const void **timestamp, unsigned int *odr);
8080

8181
extern const struct iio_buffer_setup_ops inv_icm42600_buffer_ops;

‎drivers/iio/imu/inv_icm42600/inv_icm42600_core.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const struct regmap_config inv_icm42600_spi_regmap_config = {
103103
EXPORT_SYMBOL_NS_GPL(inv_icm42600_spi_regmap_config, "IIO_ICM42600");
104104

105105
struct inv_icm42600_hw {
106-
uint8_t whoami;
106+
u8 whoami;
107107
const char *name;
108108
const struct inv_icm42600_conf *conf;
109109
};
@@ -188,9 +188,9 @@ inv_icm42600_get_mount_matrix(const struct iio_dev *indio_dev,
188188
return &st->orientation;
189189
}
190190

191-
uint32_t inv_icm42600_odr_to_period(enum inv_icm42600_odr odr)
191+
u32 inv_icm42600_odr_to_period(enum inv_icm42600_odr odr)
192192
{
193-
static uint32_t odr_periods[INV_ICM42600_ODR_NB] = {
193+
static u32 odr_periods[INV_ICM42600_ODR_NB] = {
194194
/* reserved values */
195195
0, 0, 0,
196196
/* 8kHz */

‎drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static const struct iio_chan_spec inv_icm42600_gyro_channels[] = {
7777
*/
7878
struct inv_icm42600_gyro_buffer {
7979
struct inv_icm42600_fifo_sensor_data gyro;
80-
int16_t temp;
80+
s16 temp;
8181
aligned_s64 timestamp;
8282
};
8383

@@ -139,7 +139,7 @@ static int inv_icm42600_gyro_update_scan_mode(struct iio_dev *indio_dev,
139139

140140
static int inv_icm42600_gyro_read_sensor(struct inv_icm42600_state *st,
141141
struct iio_chan_spec const *chan,
142-
int16_t *val)
142+
s16 *val)
143143
{
144144
struct device *dev = regmap_get_device(st->map);
145145
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,
179179
if (ret)
180180
goto exit;
181181

182-
*val = (int16_t)be16_to_cpup(data);
182+
*val = (s16)be16_to_cpup(data);
183183
if (*val == INV_ICM42600_DATA_INVALID)
184184
ret = -EINVAL;
185185
exit:
@@ -399,11 +399,11 @@ static int inv_icm42600_gyro_read_offset(struct inv_icm42600_state *st,
399399
int *val, int *val2)
400400
{
401401
struct device *dev = regmap_get_device(st->map);
402-
int64_t val64;
403-
int32_t bias;
402+
s64 val64;
403+
s32 bias;
404404
unsigned int reg;
405-
int16_t offset;
406-
uint8_t data[2];
405+
s16 offset;
406+
u8 data[2];
407407
int ret;
408408

409409
if (chan->type != IIO_ANGL_VEL)
@@ -457,7 +457,7 @@ static int inv_icm42600_gyro_read_offset(struct inv_icm42600_state *st,
457457
* result in nano (1000000000)
458458
* (offset * 64 * Pi * 1000000000) / (2048 * 180)
459459
*/
460-
val64 = (int64_t)offset * 64LL * 3141592653LL;
460+
val64 = (s64)offset * 64LL * 3141592653LL;
461461
/* for rounding, add + or - divisor (2048 * 180) divided by 2 */
462462
if (val64 >= 0)
463463
val64 += 2048 * 180 / 2;
@@ -475,9 +475,9 @@ static int inv_icm42600_gyro_write_offset(struct inv_icm42600_state *st,
475475
int val, int val2)
476476
{
477477
struct device *dev = regmap_get_device(st->map);
478-
int64_t val64, min, max;
478+
s64 val64, min, max;
479479
unsigned int reg, regval;
480-
int16_t offset;
480+
s16 offset;
481481
int ret;
482482

483483
if (chan->type != IIO_ANGL_VEL)
@@ -498,11 +498,11 @@ static int inv_icm42600_gyro_write_offset(struct inv_icm42600_state *st,
498498
}
499499

500500
/* inv_icm42600_gyro_calibbias: min - step - max in nano */
501-
min = (int64_t)inv_icm42600_gyro_calibbias[0] * 1000000000LL +
502-
(int64_t)inv_icm42600_gyro_calibbias[1];
503-
max = (int64_t)inv_icm42600_gyro_calibbias[4] * 1000000000LL +
504-
(int64_t)inv_icm42600_gyro_calibbias[5];
505-
val64 = (int64_t)val * 1000000000LL + (int64_t)val2;
501+
min = (s64)inv_icm42600_gyro_calibbias[0] * 1000000000LL +
502+
(s64)inv_icm42600_gyro_calibbias[1];
503+
max = (s64)inv_icm42600_gyro_calibbias[4] * 1000000000LL +
504+
(s64)inv_icm42600_gyro_calibbias[5];
505+
val64 = (s64)val * 1000000000LL + (s64)val2;
506506
if (val64 < min || val64 > max)
507507
return -EINVAL;
508508

@@ -577,7 +577,7 @@ static int inv_icm42600_gyro_read_raw(struct iio_dev *indio_dev,
577577
int *val, int *val2, long mask)
578578
{
579579
struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
580-
int16_t data;
580+
s16 data;
581581
int ret;
582582

583583
switch (chan->type) {
@@ -803,9 +803,9 @@ int inv_icm42600_gyro_parse_fifo(struct iio_dev *indio_dev)
803803
ssize_t i, size;
804804
unsigned int no;
805805
const void *accel, *gyro, *timestamp;
806-
const int8_t *temp;
806+
const s8 *temp;
807807
unsigned int odr;
808-
int64_t ts_val;
808+
s64 ts_val;
809809
/* buffer is copied to userspace, zeroing it to avoid any data leak */
810810
struct inv_icm42600_gyro_buffer buffer = { };
811811

‎drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "inv_icm42600.h"
1414
#include "inv_icm42600_temp.h"
1515

16-
static int inv_icm42600_temp_read(struct inv_icm42600_state *st, int16_t *temp)
16+
static int inv_icm42600_temp_read(struct inv_icm42600_state *st, s16 *temp)
1717
{
1818
struct device *dev = regmap_get_device(st->map);
1919
__be16 *raw;
@@ -31,7 +31,7 @@ static int inv_icm42600_temp_read(struct inv_icm42600_state *st, int16_t *temp)
3131
if (ret)
3232
goto exit;
3333

34-
*temp = (int16_t)be16_to_cpup(raw);
34+
*temp = (s16)be16_to_cpup(raw);
3535
if (*temp == INV_ICM42600_DATA_INVALID)
3636
ret = -EINVAL;
3737

@@ -48,7 +48,7 @@ int inv_icm42600_temp_read_raw(struct iio_dev *indio_dev,
4848
int *val, int *val2, long mask)
4949
{
5050
struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev);
51-
int16_t temp;
51+
s16 temp;
5252
int ret;
5353

5454
if (chan->type != IIO_TEMP)

0 commit comments

Comments
 (0)