From: Philippe Schenker <philippe.schenker@toradex.com>
To: "jic23@kernel.org" <jic23@kernel.org>
Cc: "linux-stm32@st-md-mailman.stormreply.com"
<linux-stm32@st-md-mailman.stormreply.com>,
"stefan@agner.ch" <stefan@agner.ch>,
Marcel Ziswiler <marcel.ziswiler@toradex.com>,
"David.Laight@ACULAB.COM" <David.Laight@ACULAB.COM>,
Max Krummenacher <max.krummenacher@toradex.com>,
"linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>,
"lee.jones@linaro.org" <lee.jones@linaro.org>,
"pmeerw@pmeerw.net" <pmeerw@pmeerw.net>,
"knaack.h@gmx.de" <knaack.h@gmx.de>,
"mcoquelin.stm32@gmail.com" <mcoquelin.stm32@gmail.com>,
"lars@metafoo.de" <lars@metafoo.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"alexandre.torgue@st.com" <alexandre.torgue@st.com>
Subject: Re: [PATCH 4/5] iio: stmpe-adc: Use wait_for_completion_timeout
Date: Mon, 13 May 2019 07:28:17 +0000 [thread overview]
Message-ID: <6bc5bf4c854288fae0591f33ea9ae4e5c4091616.camel@toradex.com> (raw)
In-Reply-To: <20190511111548.504948ae@archlinux>
On Sat, 2019-05-11 at 11:15 +0100, Jonathan Cameron wrote:
> On Tue, 7 May 2019 16:36:14 +0200
> Philippe Schenker <dev@pschenker.ch> wrote:
>
> > From: Philippe Schenker <philippe.schenker@toradex.com>
> >
> > Use wait_for_completion_timeout instead of
> > wait_for_completion_interuptible_timeout.
> >
> > The interruptible variant gets constantly interrupted if a user
> > program is compiled with the -pg option.
> > The killable variant was not used due to the fact that a second
> > program, reading on this device, that gets killed is then also killing
> > that wait.
> >
> > Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> Hi Phillippe
>
> This one clashed a little bit with our earlier patch to remove the
> unnecessary assignment. I've applied it by hand but please check it.
>
> Applied to the togreg branch of iio.git and pushed out as testing
> for the autobuilders to play with it.
>
> Thanks,
>
> Jonathan
Hmm, yeah I see it sorry for that! Somehow that line went in again in this
patch. Don't know why... Anyway I checked it and it looks good. Thank you!
Philippe
> > ---
> >
> > drivers/iio/adc/stmpe-adc.c | 18 ++++--------------
> > 1 file changed, 4 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
> > index 82b43e4522b6..cc752a47444c 100644
> > --- a/drivers/iio/adc/stmpe-adc.c
> > +++ b/drivers/iio/adc/stmpe-adc.c
> > @@ -77,17 +77,11 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
> > stmpe_reg_write(info->stmpe, STMPE_REG_ADC_CAPT,
> > STMPE_ADC_CH(info->channel));
> >
> > - *val = info->value;
> > -
> > - ret = wait_for_completion_interruptible_timeout
> > - (&info->completion, STMPE_ADC_TIMEOUT);
> > + ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
> >
> > if (ret <= 0) {
> > mutex_unlock(&info->lock);
> > - if (ret == 0)
> > - return -ETIMEDOUT;
> > - else
> > - return ret;
> > + return -ETIMEDOUT;
> > }
> >
> > *val = info->value;
> > @@ -116,15 +110,11 @@ static int stmpe_read_temp(struct stmpe_adc *info,
> > stmpe_reg_write(info->stmpe, STMPE_REG_TEMP_CTRL,
> > STMPE_START_ONE_TEMP_CONV);
> >
> > - ret = wait_for_completion_interruptible_timeout
> > - (&info->completion, STMPE_ADC_TIMEOUT);
> > + ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
> >
> > if (ret <= 0) {
> > mutex_unlock(&info->lock);
> > - if (ret == 0)
> > - return -ETIMEDOUT;
> > - else
> > - return ret;
> > + return -ETIMEDOUT;
> > }
> >
> > /*
next prev parent reply other threads:[~2019-05-13 7:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-07 14:36 [PATCH 1/5] iio: stmpe-adc: Add compatible name Philippe Schenker
2019-05-07 14:36 ` [PATCH 2/5] iio: stmpe-adc: Reinit completion struct on begin conversion Philippe Schenker
2019-05-11 10:08 ` Jonathan Cameron
2019-05-13 7:26 ` Philippe Schenker
2019-05-07 14:36 ` [PATCH 3/5] iio: stmpe-adc: Enable all stmpe-adc interrupts just once Philippe Schenker
2019-05-11 10:09 ` Jonathan Cameron
2019-05-07 14:36 ` [PATCH 4/5] iio: stmpe-adc: Use wait_for_completion_timeout Philippe Schenker
2019-05-11 10:15 ` Jonathan Cameron
2019-05-13 7:28 ` Philippe Schenker [this message]
2019-05-07 14:36 ` [PATCH 5/5] iio: stmpe-adc: Reset possible interrupts Philippe Schenker
2019-05-11 10:24 ` Jonathan Cameron
2019-05-13 7:47 ` Philippe Schenker
2019-05-08 7:01 ` [PATCH 1/5] iio: stmpe-adc: Add compatible name Lee Jones
2019-05-08 7:28 ` Philippe Schenker
2019-05-11 9:58 ` 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=6bc5bf4c854288fae0591f33ea9ae4e5c4091616.camel@toradex.com \
--to=philippe.schenker@toradex.com \
--cc=David.Laight@ACULAB.COM \
--cc=alexandre.torgue@st.com \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=marcel.ziswiler@toradex.com \
--cc=max.krummenacher@toradex.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=pmeerw@pmeerw.net \
--cc=stefan@agner.ch \
/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).