Merge tag 'xfs-for-linus-4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / iio / adc / vf610_adc.c

diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index e63b8e76d4c3d54edc25d23561f28a11afeb05e7..56292ae4538db6fb506966b2905064ea14ea4fc2 100644 (file)
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -275,7 +275,6 @@ static void vf610_adc_cfg_post_set(struct vf610_adc *info)
 static void vf610_adc_calibration(struct vf610_adc *info)
 {
        int adc_gc, hc_cfg;
-       int timeout;
 
        if (!info->adc_feature.calibration)
                return;
@@ -287,9 +286,7 @@ static void vf610_adc_calibration(struct vf610_adc *info)
        adc_gc = readl(info->regs + VF610_REG_ADC_GC);
        writel(adc_gc | VF610_ADC_CAL, info->regs + VF610_REG_ADC_GC);
 
-       timeout = wait_for_completion_timeout
-                       (&info->completion, VF610_ADC_TIMEOUT);
-       if (timeout == 0)
+       if (!wait_for_completion_timeout(&info->completion, VF610_ADC_TIMEOUT))
                dev_err(info->dev, "Timeout for adc calibration\n");
 
        adc_gc = readl(info->regs + VF610_REG_ADC_GS);