* [PATCH] iio: stmpe-adc: Fix wait_for_completion_timeout return value check
@ 2022-04-11 10:30 Miaoqian Lin
2022-04-11 12:05 ` Philippe Schenker
0 siblings, 1 reply; 7+ messages in thread
From: Miaoqian Lin @ 2022-04-11 10:30 UTC (permalink / raw)
To: Jonathan Cameron, Lars-Peter Clausen, Maxime Coquelin,
Alexandre Torgue, Kees Cook, Miaoqian Lin, Philippe Schenker,
linux-iio, linux-stm32, linux-arm-kernel, linux-kernel
wait_for_completion_timeout() returns unsigned long not long.
it returns 0 if timed out, and positive if completed.
The check for <= 0 is ambiguous and should be == 0 here
indicating timeout which is the only error case
Fixes: e813dde6f833 ("iio: stmpe-adc: Use wait_for_completion_timeout")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/iio/adc/stmpe-adc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
index d2d405388499..d475d1c17bfc 100644
--- a/drivers/iio/adc/stmpe-adc.c
+++ b/drivers/iio/adc/stmpe-adc.c
@@ -61,7 +61,7 @@ struct stmpe_adc {
static int stmpe_read_voltage(struct stmpe_adc *info,
struct iio_chan_spec const *chan, int *val)
{
- long ret;
+ unsigned long ret;
mutex_lock(&info->lock);
@@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
- if (ret <= 0) {
+ if (ret == 0) {
stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
STMPE_ADC_CH(info->channel));
mutex_unlock(&info->lock);
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] iio: stmpe-adc: Fix wait_for_completion_timeout return value check
2022-04-11 10:30 [PATCH] iio: stmpe-adc: Fix wait_for_completion_timeout return value check Miaoqian Lin
@ 2022-04-11 12:05 ` Philippe Schenker
2022-04-11 14:04 ` Miaoqian Lin
0 siblings, 1 reply; 7+ messages in thread
From: Philippe Schenker @ 2022-04-11 12:05 UTC (permalink / raw)
To: alexandre.torgue, linmq006, linux-stm32, keescook, lars, jic23,
mcoquelin.stm32, linux-iio, linux-arm-kernel, linux-kernel
On Mon, 2022-04-11 at 10:30 +0000, Miaoqian Lin wrote:
> wait_for_completion_timeout() returns unsigned long not long.
> it returns 0 if timed out, and positive if completed.
> The check for <= 0 is ambiguous and should be == 0 here
> indicating timeout which is the only error case
Hello and thanks for your fix. Any specific reason you didn't apply this
also in function stmpe_read_temp?
Philippe
>
> Fixes: e813dde6f833 ("iio: stmpe-adc: Use
> wait_for_completion_timeout")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> drivers/iio/adc/stmpe-adc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
> index d2d405388499..d475d1c17bfc 100644
> --- a/drivers/iio/adc/stmpe-adc.c
> +++ b/drivers/iio/adc/stmpe-adc.c
> @@ -61,7 +61,7 @@ struct stmpe_adc {
> static int stmpe_read_voltage(struct stmpe_adc *info,
> struct iio_chan_spec const *chan, int *val)
> {
> - long ret;
> + unsigned long ret;
>
> mutex_lock(&info->lock);
>
> @@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc
> *info,
>
> ret = wait_for_completion_timeout(&info->completion,
> STMPE_ADC_TIMEOUT);
>
> - if (ret <= 0) {
> + if (ret == 0) {
> stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
> STMPE_ADC_CH(info->channel));
> mutex_unlock(&info->lock);
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] iio: stmpe-adc: Fix wait_for_completion_timeout return value check
2022-04-11 12:05 ` Philippe Schenker
@ 2022-04-11 14:04 ` Miaoqian Lin
2022-04-12 1:55 ` [PATCH v2] " Miaoqian Lin
0 siblings, 1 reply; 7+ messages in thread
From: Miaoqian Lin @ 2022-04-11 14:04 UTC (permalink / raw)
To: Philippe Schenker, alexandre.torgue, linux-stm32, keescook, lars,
jic23, mcoquelin.stm32, linux-iio, linux-arm-kernel,
linux-kernel
On 2022/4/11 20:05, Philippe Schenker wrote:
> On Mon, 2022-04-11 at 10:30 +0000, Miaoqian Lin wrote:
>> wait_for_completion_timeout() returns unsigned long not long.
>> it returns 0 if timed out, and positive if completed.
>> The check for <= 0 is ambiguous and should be == 0 here
>> indicating timeout which is the only error case
> Hello and thanks for your fix. Any specific reason you didn't apply this
> also in function stmpe_read_temp?
Hi，sorry I just missed that. I will send v2 to fix this.
>> Fixes: e813dde6f833 ("iio: stmpe-adc: Use
>> wait_for_completion_timeout")
>> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
>> ---
>> drivers/iio/adc/stmpe-adc.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
>> index d2d405388499..d475d1c17bfc 100644
>> --- a/drivers/iio/adc/stmpe-adc.c
>> +++ b/drivers/iio/adc/stmpe-adc.c
>> @@ -61,7 +61,7 @@ struct stmpe_adc {
>> static int stmpe_read_voltage(struct stmpe_adc *info,
>> struct iio_chan_spec const *chan, int *val)
>> {
>> - long ret;
>> + unsigned long ret;
>>
>> mutex_lock(&info->lock);
>>
>> @@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc
>> *info,
>>
>> ret = wait_for_completion_timeout(&info->completion,
>> STMPE_ADC_TIMEOUT);
>>
>> - if (ret <= 0) {
>> + if (ret == 0) {
>> stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
>> STMPE_ADC_CH(info->channel));
>> mutex_unlock(&info->lock);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] iio: stmpe-adc: Fix wait_for_completion_timeout return value check
2022-04-11 14:04 ` Miaoqian Lin
@ 2022-04-12 1:55 ` Miaoqian Lin
2022-04-12 6:29 ` Sa, Nuno
0 siblings, 1 reply; 7+ messages in thread
From: Miaoqian Lin @ 2022-04-12 1:55 UTC (permalink / raw)
To: Jonathan Cameron, Lars-Peter Clausen, Maxime Coquelin,
Alexandre Torgue, Kees Cook, Miaoqian Lin, Philippe Schenker,
linux-iio, linux-stm32, linux-arm-kernel, linux-kernel
wait_for_completion_timeout() returns unsigned long not long.
it returns 0 if timed out, and positive if completed.
The check for <= 0 is ambiguous and should be == 0 here
indicating timeout which is the only error case
Fixes: e813dde6f833 ("iio: stmpe-adc: Use wait_for_completion_timeout")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
changes in v2:
- Fix same issue in stmpe_read_temp.
---
drivers/iio/adc/stmpe-adc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
index d2d405388499..83e0ac4467ca 100644
--- a/drivers/iio/adc/stmpe-adc.c
+++ b/drivers/iio/adc/stmpe-adc.c
@@ -61,7 +61,7 @@ struct stmpe_adc {
static int stmpe_read_voltage(struct stmpe_adc *info,
struct iio_chan_spec const *chan, int *val)
{
- long ret;
+ unsigned long ret;
mutex_lock(&info->lock);
@@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
- if (ret <= 0) {
+ if (ret == 0) {
stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
STMPE_ADC_CH(info->channel));
mutex_unlock(&info->lock);
@@ -96,7 +96,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
static int stmpe_read_temp(struct stmpe_adc *info,
struct iio_chan_spec const *chan, int *val)
{
- long ret;
+ unsigned long ret;
mutex_lock(&info->lock);
@@ -114,7 +114,7 @@ static int stmpe_read_temp(struct stmpe_adc *info,
ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
- if (ret <= 0) {
+ if (ret == 0) {
mutex_unlock(&info->lock);
return -ETIMEDOUT;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCH v2] iio: stmpe-adc: Fix wait_for_completion_timeout return value check
2022-04-12 1:55 ` [PATCH v2] " Miaoqian Lin
@ 2022-04-12 6:29 ` Sa, Nuno
2022-04-12 6:51 ` [PATCH v3] iio: adc: " Miaoqian Lin
0 siblings, 1 reply; 7+ messages in thread
From: Sa, Nuno @ 2022-04-12 6:29 UTC (permalink / raw)
To: Miaoqian Lin, Jonathan Cameron, Lars-Peter Clausen,
Maxime Coquelin, Alexandre Torgue, Kees Cook, Philippe Schenker,
linux-iio, linux-stm32, linux-arm-kernel, linux-kernel
> -----Original Message-----
> From: Miaoqian Lin <linmq006@gmail.com>
> Sent: Tuesday, April 12, 2022 3:56 AM
> To: Jonathan Cameron <jic23@kernel.org>; Lars-Peter Clausen
> <lars@metafoo.de>; Maxime Coquelin
> <mcoquelin.stm32@gmail.com>; Alexandre Torgue
> <alexandre.torgue@foss.st.com>; Kees Cook
> <keescook@chromium.org>; Miaoqian Lin <linmq006@gmail.com>;
> Philippe Schenker <philippe.schenker@toradex.com>; linux-
> iio@vger.kernel.org; linux-stm32@st-md-mailman.stormreply.com;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Subject: [PATCH v2] iio: stmpe-adc: Fix wait_for_completion_timeout
> return value check
>
> [External]
>
> wait_for_completion_timeout() returns unsigned long not long.
> it returns 0 if timed out, and positive if completed.
> The check for <= 0 is ambiguous and should be == 0 here
> indicating timeout which is the only error case
>
> Fixes: e813dde6f833 ("iio: stmpe-adc: Use
> wait_for_completion_timeout")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> changes in v2:
> - Fix same issue in stmpe_read_temp.
> ---
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
(I guess the subject also needs tweaking for the preferred format)
> drivers/iio/adc/stmpe-adc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
> index d2d405388499..83e0ac4467ca 100644
> --- a/drivers/iio/adc/stmpe-adc.c
> +++ b/drivers/iio/adc/stmpe-adc.c
> @@ -61,7 +61,7 @@ struct stmpe_adc {
> static int stmpe_read_voltage(struct stmpe_adc *info,
> struct iio_chan_spec const *chan, int *val)
> {
> - long ret;
> + unsigned long ret;
>
> mutex_lock(&info->lock);
>
> @@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc
> *info,
>
> ret = wait_for_completion_timeout(&info->completion,
> STMPE_ADC_TIMEOUT);
>
> - if (ret <= 0) {
> + if (ret == 0) {
> stmpe_reg_write(info->stmpe,
> STMPE_REG_ADC_INT_STA,
> STMPE_ADC_CH(info->channel));
> mutex_unlock(&info->lock);
> @@ -96,7 +96,7 @@ static int stmpe_read_voltage(struct stmpe_adc
> *info,
> static int stmpe_read_temp(struct stmpe_adc *info,
> struct iio_chan_spec const *chan, int *val)
> {
> - long ret;
> + unsigned long ret;
>
> mutex_lock(&info->lock);
>
> @@ -114,7 +114,7 @@ static int stmpe_read_temp(struct stmpe_adc
> *info,
>
> ret = wait_for_completion_timeout(&info->completion,
> STMPE_ADC_TIMEOUT);
>
> - if (ret <= 0) {
> + if (ret == 0) {
> mutex_unlock(&info->lock);
> return -ETIMEDOUT;
> }
> --
> 2.17.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3] iio: adc: stmpe-adc: Fix wait_for_completion_timeout return value check
2022-04-12 6:29 ` Sa, Nuno
@ 2022-04-12 6:51 ` Miaoqian Lin
2022-04-12 8:52 ` Philippe Schenker
0 siblings, 1 reply; 7+ messages in thread
From: Miaoqian Lin @ 2022-04-12 6:51 UTC (permalink / raw)
To: Jonathan Cameron, Lars-Peter Clausen, Maxime Coquelin,
Alexandre Torgue, Miaoqian Lin, Kees Cook, Philippe Schenker,
linux-iio, linux-stm32, linux-arm-kernel, linux-kernel
wait_for_completion_timeout() returns unsigned long not long.
it returns 0 if timed out, and positive if completed.
The check for <= 0 is ambiguous and should be == 0 here
indicating timeout which is the only error case
Fixes: e813dde6f833 ("iio: stmpe-adc: Use wait_for_completion_timeout")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
changes in v2:
- Fix same issue in stmpe_read_temp.
---
changes in v3:
- update the patch subject.
---
drivers/iio/adc/stmpe-adc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
index d2d405388499..83e0ac4467ca 100644
--- a/drivers/iio/adc/stmpe-adc.c
+++ b/drivers/iio/adc/stmpe-adc.c
@@ -61,7 +61,7 @@ struct stmpe_adc {
static int stmpe_read_voltage(struct stmpe_adc *info,
struct iio_chan_spec const *chan, int *val)
{
- long ret;
+ unsigned long ret;
mutex_lock(&info->lock);
@@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
- if (ret <= 0) {
+ if (ret == 0) {
stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
STMPE_ADC_CH(info->channel));
mutex_unlock(&info->lock);
@@ -96,7 +96,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
static int stmpe_read_temp(struct stmpe_adc *info,
struct iio_chan_spec const *chan, int *val)
{
- long ret;
+ unsigned long ret;
mutex_lock(&info->lock);
@@ -114,7 +114,7 @@ static int stmpe_read_temp(struct stmpe_adc *info,
ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
- if (ret <= 0) {
+ if (ret == 0) {
mutex_unlock(&info->lock);
return -ETIMEDOUT;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3] iio: adc: stmpe-adc: Fix wait_for_completion_timeout return value check
2022-04-12 6:51 ` [PATCH v3] iio: adc: " Miaoqian Lin
@ 2022-04-12 8:52 ` Philippe Schenker
0 siblings, 0 replies; 7+ messages in thread
From: Philippe Schenker @ 2022-04-12 8:52 UTC (permalink / raw)
To: alexandre.torgue, linmq006, linux-stm32, keescook, lars, jic23,
mcoquelin.stm32, linux-iio, linux-arm-kernel, linux-kernel
On Tue, 2022-04-12 at 06:51 +0000, Miaoqian Lin wrote:
> wait_for_completion_timeout() returns unsigned long not long.
> it returns 0 if timed out, and positive if completed.
> The check for <= 0 is ambiguous and should be == 0 here
> indicating timeout which is the only error case
>
> Fixes: e813dde6f833 ("iio: stmpe-adc: Use
> wait_for_completion_timeout")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Philippe Schenker <philippe.schenker@toradex.com>
> ---
> changes in v2:
> - Fix same issue in stmpe_read_temp.
> ---
> changes in v3:
> - update the patch subject.
> ---
> drivers/iio/adc/stmpe-adc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
> index d2d405388499..83e0ac4467ca 100644
> --- a/drivers/iio/adc/stmpe-adc.c
> +++ b/drivers/iio/adc/stmpe-adc.c
> @@ -61,7 +61,7 @@ struct stmpe_adc {
> static int stmpe_read_voltage(struct stmpe_adc *info,
> struct iio_chan_spec const *chan, int *val)
> {
> - long ret;
> + unsigned long ret;
>
> mutex_lock(&info->lock);
>
> @@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc
> *info,
>
> ret = wait_for_completion_timeout(&info->completion,
> STMPE_ADC_TIMEOUT);
>
> - if (ret <= 0) {
> + if (ret == 0) {
> stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
> STMPE_ADC_CH(info->channel));
> mutex_unlock(&info->lock);
> @@ -96,7 +96,7 @@ static int stmpe_read_voltage(struct stmpe_adc
> *info,
> static int stmpe_read_temp(struct stmpe_adc *info,
> struct iio_chan_spec const *chan, int *val)
> {
> - long ret;
> + unsigned long ret;
>
> mutex_lock(&info->lock);
>
> @@ -114,7 +114,7 @@ static int stmpe_read_temp(struct stmpe_adc *info,
>
> ret = wait_for_completion_timeout(&info->completion,
> STMPE_ADC_TIMEOUT);
>
> - if (ret <= 0) {
> + if (ret == 0) {
> mutex_unlock(&info->lock);
> return -ETIMEDOUT;
> }
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-04-12 9:48 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-11 10:30 [PATCH] iio: stmpe-adc: Fix wait_for_completion_timeout return value check Miaoqian Lin
2022-04-11 12:05 ` Philippe Schenker
2022-04-11 14:04 ` Miaoqian Lin
2022-04-12 1:55 ` [PATCH v2] " Miaoqian Lin
2022-04-12 6:29 ` Sa, Nuno
2022-04-12 6:51 ` [PATCH v3] iio: adc: " Miaoqian Lin
2022-04-12 8:52 ` Philippe Schenker
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).