From: Jonathan Cameron <jic23@kernel.org>
To: Subhajit Ghosh <subhajit.ghosh@tweaklogic.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
Dan Carpenter <dan.carpenter@linaro.org>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: light: apds9306: Improve apds9306_write_event_config()
Date: Sat, 6 Apr 2024 16:53:14 +0100 [thread overview]
Message-ID: <20240406165314.1b3403df@jic23-huawei> (raw)
In-Reply-To: <20240405104641.29478-1-subhajit.ghosh@tweaklogic.com>
On Fri, 5 Apr 2024 21:16:41 +1030
Subhajit Ghosh <subhajit.ghosh@tweaklogic.com> wrote:
> Simplify event configuration flow.
>
> Suggested-by: Jonathan Cameron <jic23@kernel.org>
> Link: https://lore.kernel.org/all/20240310124237.52fa8a56@jic23-huawei/
> Signed-off-by: Subhajit Ghosh <subhajit.ghosh@tweaklogic.com>
LGTM
Applied to the togreg branch of iio.git and pushed out initially as testing
to let 0-day see if we missed anything.
Jonathan
> ---
> drivers/iio/light/apds9306.c | 48 ++++++++++++++++++++----------------
> 1 file changed, 27 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/iio/light/apds9306.c b/drivers/iio/light/apds9306.c
> index 4d8490602cd7..465b6957682b 100644
> --- a/drivers/iio/light/apds9306.c
> +++ b/drivers/iio/light/apds9306.c
> @@ -1075,14 +1075,16 @@ static int apds9306_write_event_config(struct iio_dev *indio_dev,
> {
> struct apds9306_data *data = iio_priv(indio_dev);
> struct apds9306_regfields *rf = &data->rf;
> - int ret, val;
> -
> - state = !!state;
> + int ret, enabled;
>
> switch (type) {
> case IIO_EV_TYPE_THRESH: {
> guard(mutex)(&data->mutex);
>
> + ret = regmap_field_read(rf->int_en, &enabled);
> + if (ret)
> + return ret;
> +
> /*
> * If interrupt is enabled, the channel is set before enabling
> * the interrupt. In case of disable, no need to switch
> @@ -1091,38 +1093,42 @@ static int apds9306_write_event_config(struct iio_dev *indio_dev,
> */
> if (state) {
> if (chan->type == IIO_LIGHT)
> - val = 1;
> + ret = regmap_field_write(rf->int_src, 1);
> else if (chan->type == IIO_INTENSITY)
> - val = 0;
> + ret = regmap_field_write(rf->int_src, 0);
> else
> return -EINVAL;
>
> - ret = regmap_field_write(rf->int_src, val);
> if (ret)
> return ret;
> - }
>
> - ret = regmap_field_read(rf->int_en, &val);
> - if (ret)
> - return ret;
> -
> - if (val == state)
> - return 0;
> + if (enabled)
> + return 0;
>
> - ret = regmap_field_write(rf->int_en, state);
> - if (ret)
> - return ret;
> + ret = regmap_field_write(rf->int_en, 1);
> + if (ret)
> + return ret;
>
> - if (state)
> return pm_runtime_resume_and_get(data->dev);
> + } else {
> + if (!enabled)
> + return 0;
>
> - pm_runtime_mark_last_busy(data->dev);
> - pm_runtime_put_autosuspend(data->dev);
> + ret = regmap_field_write(rf->int_en, 0);
> + if (ret)
> + return ret;
>
> - return 0;
> + pm_runtime_mark_last_busy(data->dev);
> + pm_runtime_put_autosuspend(data->dev);
> +
> + return 0;
> + }
> }
> case IIO_EV_TYPE_THRESH_ADAPTIVE:
> - return regmap_field_write(rf->int_thresh_var_en, state);
> + if (state)
> + return regmap_field_write(rf->int_thresh_var_en, 1);
> + else
> + return regmap_field_write(rf->int_thresh_var_en, 0);
> default:
> return -EINVAL;
> }
>
> base-commit: 526f7f17b651c78ead26fea7cea20948c00e47a5
prev parent reply other threads:[~2024-04-06 15:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 10:46 [PATCH] iio: light: apds9306: Improve apds9306_write_event_config() Subhajit Ghosh
2024-04-06 15:53 ` Jonathan Cameron [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=20240406165314.1b3403df@jic23-huawei \
--to=jic23@kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=subhajit.ghosh@tweaklogic.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 read-only IMAP folder(s) and NNTP newsgroup(s).