leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio: stmpe-adc: Use wait_for_completion_timeout

Browse Source 
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>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Philippe Schenker 2019-05-07 16:36:14 +02:00 committed by Jonathan Cameron
parent 4bd44bb2b4
commit e813dde6f8
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/iio/adc/stmpe-adc.c
View File

@ -77,15 +77,11 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
stmpe_reg_write(info->stmpe, STMPE_REG_ADC_CAPT, stmpe_reg_write(info->stmpe, STMPE_REG_ADC_CAPT,
STMPE_ADC_CH(info->channel)); STMPE_ADC_CH(info->channel));
ret = wait_for_completion_interruptible_timeout ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
(&info->completion, STMPE_ADC_TIMEOUT);
if (ret <= 0) { if (ret <= 0) {
mutex_unlock(&info->lock); mutex_unlock(&info->lock);
if (ret == 0) return -ETIMEDOUT;
return -ETIMEDOUT;
else
return ret;
} }
*val = info->value; *val = info->value;
@ -114,15 +110,11 @@ static int stmpe_read_temp(struct stmpe_adc *info,
stmpe_reg_write(info->stmpe, STMPE_REG_TEMP_CTRL, stmpe_reg_write(info->stmpe, STMPE_REG_TEMP_CTRL,
STMPE_START_ONE_TEMP_CONV); STMPE_START_ONE_TEMP_CONV);
ret = wait_for_completion_interruptible_timeout ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
(&info->completion, STMPE_ADC_TIMEOUT);
if (ret <= 0) { if (ret <= 0) {
mutex_unlock(&info->lock); mutex_unlock(&info->lock);
if (ret == 0) return -ETIMEDOUT;
return -ETIMEDOUT;
else
return ret;
} }
/* /*