LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Philippe Schenker <dev@pschenker.ch>
To: linux-iio@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
	Stefan Agner <stefan@agner.ch>, Hartmut Knaack <knaack.h@gmx.de>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>,
	David Laight <David.Laight@ACULAB.COM>,
	dev@pschenker.ch,
	Philippe Schenker <philippe.schenker@toradex.com>,
	Max Krummenacher <max.krummenacher@toradex.com>,
	Alexandre Torgue <alexandre.torgue@st.com>,
	linux-kernel@vger.kernel.org, Lee Jones <lee.jones@linaro.org>,
	Maxime Coquelin <mcoquelin.stm32@gmail.com>,
	linux-stm32@st-md-mailman.stormreply.com,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] iio: stmpe-adc: Use wait_for_completion_timeout
Date: Tue,  7 May 2019 16:36:14 +0200	[thread overview]
Message-ID: <20190507143615.28477-4-dev@pschenker.ch> (raw)
In-Reply-To: <20190507143615.28477-1-dev@pschenker.ch>

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>
---

 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;
 	}
 
 	/*
-- 
2.21.0


  parent reply	other threads:[~2019-05-07 14:36 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 ` Philippe Schenker [this message]
2019-05-11 10:15   ` [PATCH 4/5] iio: stmpe-adc: Use wait_for_completion_timeout Jonathan Cameron
2019-05-13  7:28     ` Philippe Schenker
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=20190507143615.28477-4-dev@pschenker.ch \
    --to=dev@pschenker.ch \
    --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=philippe.schenker@toradex.com \
    --cc=pmeerw@pmeerw.net \
    --cc=stefan@agner.ch \
    --subject='Re: [PATCH 4/5] iio: stmpe-adc: Use wait_for_completion_timeout' \
    /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

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).