From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Jonathan Cameron <jonathan.cameron@huawei.com>
Cc: jic23@kernel.org, lorenzo.bianconi@redhat.com,
linux-iio@vger.kernel.org, martin.kepplinger@puri.sm
Subject: Re: [PATCH] iio: imu: st_lsm6dsx: introduce update_fifo function pointer
Date: Mon, 19 Aug 2019 13:33:08 +0200 [thread overview]
Message-ID: <20190819113308.GC17835@localhost.localdomain> (raw)
In-Reply-To: <20190819115126.0000185d@huawei.com>
[-- Attachment #1: Type: text/plain, Size: 6102 bytes --]
> On Mon, 19 Aug 2019 12:06:05 +0200
> Lorenzo Bianconi <lorenzo@kernel.org> wrote:
>
> > Introduce update_fifo routine pointer in st_lsm6dsx_fifo_ops data
> > structure since we will need a different update FIFO configuration
> > callback adding support for lsm6ds0/lsm9ds1 imu device
> >
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
>
> I'm fine with the patch itself, but would much rather pick this up as a first
> patch in the series that makes use of it. Right now it is an unjustified bit
> of refactoring..
Martin can fold this as first patch of v5, up to you.
Regards,
Lorenzo
>
> > ---
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 ++++
> > .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 19 +++++++++++++++----
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 ++++++
> > 3 files changed, 25 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > index 4e8e67ae1632..055e52dec36a 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > @@ -75,6 +75,7 @@ struct st_lsm6dsx_reg {
> > u8 mask;
> > };
> >
> > +struct st_lsm6dsx_sensor;
> > struct st_lsm6dsx_hw;
> >
> > struct st_lsm6dsx_odr {
> > @@ -101,12 +102,14 @@ struct st_lsm6dsx_fs_table_entry {
> >
> > /**
> > * struct st_lsm6dsx_fifo_ops - ST IMU FIFO settings
> > + * @update_fifo: Update FIFO configuration callback.
> > * @read_fifo: Read FIFO callback.
> > * @fifo_th: FIFO threshold register info (addr + mask).
> > * @fifo_diff: FIFO diff status register info (addr + mask).
> > * @th_wl: FIFO threshold word length.
> > */
> > struct st_lsm6dsx_fifo_ops {
> > + int (*update_fifo)(struct st_lsm6dsx_sensor *sensor, bool enable);
> > int (*read_fifo)(struct st_lsm6dsx_hw *hw);
> > struct {
> > u8 addr;
> > @@ -327,6 +330,7 @@ int st_lsm6dsx_fifo_setup(struct st_lsm6dsx_hw *hw);
> > int st_lsm6dsx_set_watermark(struct iio_dev *iio_dev, unsigned int val);
> > int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor,
> > u16 watermark);
> > +int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable);
> > int st_lsm6dsx_flush_fifo(struct st_lsm6dsx_hw *hw);
> > int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw,
> > enum st_lsm6dsx_fifo_mode fifo_mode);
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
> > index 2c03a5b80f80..b0f3da1976e4 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
> > @@ -602,9 +602,8 @@ int st_lsm6dsx_flush_fifo(struct st_lsm6dsx_hw *hw)
> > return err;
> > }
> >
> > -static int st_lsm6dsx_update_fifo(struct iio_dev *iio_dev, bool enable)
> > +int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable)
> > {
> > - struct st_lsm6dsx_sensor *sensor = iio_priv(iio_dev);
> > struct st_lsm6dsx_hw *hw = sensor->hw;
> > int err;
> >
> > @@ -676,12 +675,24 @@ static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private)
> >
> > static int st_lsm6dsx_buffer_preenable(struct iio_dev *iio_dev)
> > {
> > - return st_lsm6dsx_update_fifo(iio_dev, true);
> > + struct st_lsm6dsx_sensor *sensor = iio_priv(iio_dev);
> > + struct st_lsm6dsx_hw *hw = sensor->hw;
> > +
> > + if (!hw->settings->fifo_ops.update_fifo)
> > + return -ENOTSUPP;
> > +
> > + return hw->settings->fifo_ops.update_fifo(sensor, true);
> > }
> >
> > static int st_lsm6dsx_buffer_postdisable(struct iio_dev *iio_dev)
> > {
> > - return st_lsm6dsx_update_fifo(iio_dev, false);
> > + struct st_lsm6dsx_sensor *sensor = iio_priv(iio_dev);
> > + struct st_lsm6dsx_hw *hw = sensor->hw;
> > +
> > + if (!hw->settings->fifo_ops.update_fifo)
> > + return -ENOTSUPP;
> > +
> > + return hw->settings->fifo_ops.update_fifo(sensor, false);
> > }
> >
> > static const struct iio_buffer_setup_ops st_lsm6dsx_buffer_ops = {
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > index 85824d6739ee..0aa93b45d772 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > @@ -154,6 +154,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > },
> > },
> > .fifo_ops = {
> > + .update_fifo = st_lsm6dsx_update_fifo,
> > .read_fifo = st_lsm6dsx_read_fifo,
> > .fifo_th = {
> > .addr = 0x06,
> > @@ -262,6 +263,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > },
> > },
> > .fifo_ops = {
> > + .update_fifo = st_lsm6dsx_update_fifo,
> > .read_fifo = st_lsm6dsx_read_fifo,
> > .fifo_th = {
> > .addr = 0x06,
> > @@ -379,6 +381,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > },
> > },
> > .fifo_ops = {
> > + .update_fifo = st_lsm6dsx_update_fifo,
> > .read_fifo = st_lsm6dsx_read_fifo,
> > .fifo_th = {
> > .addr = 0x06,
> > @@ -490,6 +493,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > },
> > },
> > .fifo_ops = {
> > + .update_fifo = st_lsm6dsx_update_fifo,
> > .read_fifo = st_lsm6dsx_read_tagged_fifo,
> > .fifo_th = {
> > .addr = 0x07,
> > @@ -616,6 +620,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > },
> > },
> > .fifo_ops = {
> > + .update_fifo = st_lsm6dsx_update_fifo,
> > .read_fifo = st_lsm6dsx_read_tagged_fifo,
> > .fifo_th = {
> > .addr = 0x07,
> > @@ -719,6 +724,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > },
> > },
> > .fifo_ops = {
> > + .update_fifo = st_lsm6dsx_update_fifo,
> > .read_fifo = st_lsm6dsx_read_tagged_fifo,
> > .fifo_th = {
> > .addr = 0x07,
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
prev parent reply other threads:[~2019-08-19 11:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 10:06 [PATCH] iio: imu: st_lsm6dsx: introduce update_fifo function pointer Lorenzo Bianconi
2019-08-19 10:51 ` Jonathan Cameron
2019-08-19 11:33 ` Lorenzo Bianconi [this message]
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=20190819113308.GC17835@localhost.localdomain \
--to=lorenzo@kernel.org \
--cc=jic23@kernel.org \
--cc=jonathan.cameron@huawei.com \
--cc=linux-iio@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=martin.kepplinger@puri.sm \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.