From: Jonathan Cameron <jic23@kernel.org>
To: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PATCH] iio: imu: st_lsm6dsx: do not use a fixed read len in read_oneshot
Date: Fri, 16 Nov 2018 18:21:23 +0000 [thread overview]
Message-ID: <20181116182123.422d9305@archlinux> (raw)
In-Reply-To: <e0b8bcec785b02cf14aab34a524878df6ed4cd7a.1541975146.git.lorenzo.bianconi@redhat.com>
On Sun, 11 Nov 2018 23:28:28 +0100
Lorenzo Bianconi <lorenzo.bianconi@redhat.com> wrote:
> 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
>
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 31 +++++++++++++-------
> 1 file changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> index ee59b0cac84f..b908df0380b3 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> @@ -27,6 +27,7 @@
> #include <linux/iio/iio.h>
> #include <linux/iio/sysfs.h>
> #include <linux/bitfield.h>
> +#include <linux/slab.h>
>
> #include "st_lsm6dsx.h"
>
> @@ -432,31 +433,39 @@ 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 ret, delay, len = ch->scan_type.realbits >> 3;
> + u8 *data;
>
> - err = st_lsm6dsx_shub_set_enable(sensor, true);
> - if (err < 0)
> - return err;
> + ret = st_lsm6dsx_shub_set_enable(sensor, true);
> + if (ret < 0)
> + return ret;
> +
> + data = kmalloc(len, GFP_KERNEL);
> + if (!data)
> + return -ENOMEM;
Do we not want to disable should this fail?
Easier might be to just do the allocation before the set_enable
call.
I'd also be tempted to just put a big enough buffer on the stack, or
into the sensor structure.
Also, I haven't checked but is there potential for DMA into this
buffer?
>
> 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;
> + ret = st_lsm6dsx_shub_read(sensor, ch->address, data, len);
> + if (ret < 0)
> + goto out;
>
> st_lsm6dsx_shub_set_enable(sensor, false);
>
> switch (len) {
> case 2:
> - *val = (s16)le16_to_cpu(data);
> + *val = (s16)le16_to_cpu(*((__le16 *)data));
> + ret = IIO_VAL_INT;
> break;
> default:
> - return -EINVAL;
> + ret = -EINVAL;
> + break;
> }
>
> - return IIO_VAL_INT;
> +out:
> + kfree(data);
> + return ret;
> }
>
> static int
next prev parent reply other threads:[~2018-11-17 4:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1541975146.git.lorenzo.bianconi@redhat.com>
2018-11-11 22:28 ` [PATCH] iio: imu: st_lsm6dsx: do not use a fixed read len in read_oneshot Lorenzo Bianconi
2018-11-16 18:21 ` Jonathan Cameron [this message]
2018-11-16 18:31 ` Lorenzo Bianconi
2018-11-17 16:27 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181116182123.422d9305@archlinux \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).