From: Jonathan Cameron <jic23@kernel.org>
To: Jonathan Bakker <xc-racer2@live.ca>
Cc: linus.walleij@linaro.org, knaack.h@gmx.de, lars@metafoo.de,
pmeerw@pmeerw.net, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: light: gp2ap002: Take runtime PM reference on light read
Date: Sun, 10 May 2020 11:20:42 +0100 [thread overview]
Message-ID: <20200510112042.3f995867@archlinux> (raw)
In-Reply-To: <BN6PR04MB0660DD24B7B4418DCC2806FBA3A30@BN6PR04MB0660.namprd04.prod.outlook.com>
On Fri, 8 May 2020 18:42:21 -0700
Jonathan Bakker <xc-racer2@live.ca> wrote:
> The light sensor needs the regulators to be enabled which means
> the runtime PM needs to be on. This only happened when the
> proximity part of the chip was enabled.
>
> As fallout from this change, only report changes to the prox
> state in the interrupt handler when it is explicitly enabled.
>
> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Looks good to me, but needs a fixes tag as we'll want to fix
this up in all kernels where it applies (just the current
RCs I think..)
Thanks,
Jonathan
> ---
> drivers/iio/light/gp2ap002.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/light/gp2ap002.c b/drivers/iio/light/gp2ap002.c
> index b7ef16b28280..7a2679bdc987 100644
> --- a/drivers/iio/light/gp2ap002.c
> +++ b/drivers/iio/light/gp2ap002.c
> @@ -158,6 +158,9 @@ static irqreturn_t gp2ap002_prox_irq(int irq, void *d)
> int val;
> int ret;
>
> + if (!gp2ap002->enabled)
> + goto err_retrig;
> +
> ret = regmap_read(gp2ap002->map, GP2AP002_PROX, &val);
> if (ret) {
> dev_err(gp2ap002->dev, "error reading proximity\n");
> @@ -247,6 +250,8 @@ static int gp2ap002_read_raw(struct iio_dev *indio_dev,
> struct gp2ap002 *gp2ap002 = iio_priv(indio_dev);
> int ret;
>
> + pm_runtime_get_sync(gp2ap002->dev);
> +
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> switch (chan->type) {
> @@ -255,13 +260,21 @@ static int gp2ap002_read_raw(struct iio_dev *indio_dev,
> if (ret < 0)
> return ret;
> *val = ret;
> - return IIO_VAL_INT;
> + ret = IIO_VAL_INT;
> + goto out;
> default:
> - return -EINVAL;
> + ret = -EINVAL;
> + goto out;
> }
> default:
> - return -EINVAL;
> + ret = -EINVAL;
> }
> +
> +out:
> + pm_runtime_mark_last_busy(gp2ap002->dev);
> + pm_runtime_put_autosuspend(gp2ap002->dev);
> +
> + return ret;
> }
>
> static int gp2ap002_init(struct gp2ap002 *gp2ap002)
next prev parent reply other threads:[~2020-05-10 10:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 1:42 [PATCH] iio: light: gp2ap002: Take runtime PM reference on light read Jonathan Bakker
2020-05-10 10:20 ` Jonathan Cameron [this message]
2020-05-10 15:58 ` [PATCH v2] " Jonathan Bakker
2020-05-12 9:03 ` Linus Walleij
2020-05-16 16:34 ` 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=20200510112042.3f995867@archlinux \
--to=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linus.walleij@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=xc-racer2@live.ca \
/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).