iio: imu: st_lsm6dsx: do not use a fixed read len in read_oneshot
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/1 iio: imu: st_lsm6dsx: do not use a fixed read len in read_oneshot
Generalize st_lsm6dsx_shub_read_oneshot in order to not use a fixed read length and take into account iio channel realbits for single read operations
---
Changes since v1:
- allocate data buffer on the stack instead of using kmalloc
- stop the sensor even if the read operation fails
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +8 -6
@@ -432,8 +432,8 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor,struct iio_chan_spec const *ch, int *val) { - int err, delay, len = ch->scan_type.realbits >> 3; -__le16 data; + int err, delay, len; +u8 data[4 ]; err =st_lsm6dsx_shub_set_enable (sensor, true);if (err <0 )
@@ -442,15 +442,17 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor, delay =1000000 / sensor->odr;usleep_range (delay,2 * delay); - err =st_lsm6dsx_shub_read (sensor, ch->address, (u8 *)&data, len); -if (err <0 ) -return err; + len =min_t (int,sizeof (data), ch->scan_type.realbits >>3 ); + err =st_lsm6dsx_shub_read (sensor, ch->address, data, len);st_lsm6dsx_shub_set_enable (sensor, false); +if (err <0 ) +return err; +switch (len) {case 2 : - *val = (s16 )le16_to_cpu (data); + *val = (s16 )le16_to_cpu (*((__le16 *)data));break ;default :return -EINVAL ;
Signature · 1 line
2.19.1
Jonathan Cameron
maintainerQuoted 5 lines · On Sat, 17 Nov 2018 19:04:27 +0100 Lorenzo Bianconi…
Generalize
st_lsm6dsx_shub_read_oneshotin order to not use a fixed read length and take into account iio channel realbits for single read operationsSigned-off-by Lorenzo Bianconi <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it.
Thanks,
Jonathan
Quoted 45 lines
---
Changes since v1:
- allocate data buffer on the stack instead of using kmalloc
- stop the sensor even if the read operation fails--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +8
-6@@ -432,8 +432,8 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor,struct iio_chan_spec const *ch, int *val) { - int err, delay, len = ch->scan_type.realbits >> 3; -__le16 data; + int err, delay, len; +u8 data[4 ]; err =st_lsm6dsx_shub_set_enable (sensor, true);if (err <0 )@@ -442,15 +442,17 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor, delay =1000000 / sensor->odr;usleep_range (delay,2 * delay); - err =st_lsm6dsx_shub_read (sensor, ch->address, (u8 *)&data, len); -if (err <0 ) -return err; + len =min_t (int,sizeof (data), ch->scan_type.realbits >>3 ); + err =st_lsm6dsx_shub_read (sensor, ch->address, data, len);st_lsm6dsx_shub_set_enable (sensor, false); +if (err <0 ) +return err; +switch (len) {case 2 : - *val = (s16 )le16_to_cpu (data); + *val = (s16 )le16_to_cpu (*((__le16 *)data));break ;default :return -EINVAL ;