lkml.org 
[lkml]   [2019]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] iio: stmpe-adc: Use wait_for_completion_timeout
    Date
    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
    \
     
     \ /
      Last update: 2019-05-07 16:36    [W:4.054 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site