Re: [PATCH RFC] iio: iadc: wait_for_completion_timeout time in jiffies

From: Ivan T. Ivanov
Date: Mon Jan 05 2015 - 10:33:22 EST



On Sun, 2015-01-04 at 11:16 +0000, Jonathan Cameron wrote:
> On 31/12/14 08:59, Nicholas Mc Guire wrote:
> > The timeout value to wait_for_completion_timeout is in jiffies but
> > the value being passed seems like it was intended to by microseconds
> > Note that the timeout was extremely long thus it might be too short
> > now. In any case it probably should be passed through usecs_to_jiffies()
> > or msecs_to_jiffies()
> >
> > patch is against linux-next 3.19.0-rc1 -next-20141226
> >
> > patch was only compile-tested x86_64_defcofnig + CONFIG_SPMI=m
> > CONFIG_IIO=m, CONFIG_QCOM_SPMI_IADC=m
> >
> > Signed-off-by: Nicholas Mc Guire herr@xxxxxxx>
> Certainly suspicious and I'd draw the same conclusion you did!
> Anyhow just waiting for Ivan to take a look as it's his driver.

Oops, true. Timeout is calculated in microseconds and have to
be converted to jiffies.

Thanks.

Acked-by: Ivan T. Ivanov <iivanov@xxxxxxxxxx>


>
> Thanks,
>
> Jonathan
> > ---
> > drivers/iio/adc/qcom-spmi-iadc.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/iio/adc/qcom-spmi-iadc.c b/drivers/iio/adc/qcom-spmi-iadc.c
> > index b9666f2..3080562 100644
> > --- a/drivers/iio/adc/qcom-spmi-iadc.c
> > +++ b/drivers/iio/adc/qcom-spmi-iadc.c
> > @@ -296,7 +296,8 @@ static int iadc_do_conversion(struct iadc_chip *iadc, int chan, u16 *data)
> > if (iadc->poll_eoc) {
> > ret = iadc_poll_wait_eoc(iadc, wait);
> > } else {
> > - ret = wait_for_completion_timeout(&iadc->complete, wait);
> > + ret = wait_for_completion_timeout(&iadc->complete,
> > + usecs_to_jiffies(wait));
> > if (!ret)
> > ret = -ETIMEDOUT;
> > else
> >
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/