mfd: ab8500-gpadc: Reduce conversion timeout

Reduce the conversion timeout from 2s to 0.5s

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>

diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 580f1008d67a1f7ced469fe32a1aea3f25bcb9aa..44fa224a443eba06d6881dc4eb14bf9657c48da4 100644 (file)
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -86,6 +86,8 @@
 /* Time in ms before disabling regulator */
 #define GPADC_AUDOSUSPEND_DELAY                1
 
+#define CONVERSION_TIME                        500 /* ms */
+
 enum cal_channels {
        ADC_INPUT_VMAIN = 0,
        ADC_INPUT_BTEMP,
@@ -372,7 +374,8 @@ int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel)
                goto out;
        }
        /* wait for completion of conversion */
-       if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, 2*HZ)) {
+       if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete,
+                                        msecs_to_jiffies(CONVERSION_TIME))) {
                dev_err(gpadc->dev,
                        "timeout: didn't receive GPADC conversion interrupt\n");
                ret = -EINVAL;