Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acb069c0 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: mf6x4: use comedi_timeout() 



Use comedi_timeout() to wait for the analog input end-of-conversion.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83b4d991

drivers/staging/comedi/drivers/mf6x4.c

+10 −13
Original line number Diff line number Diff line
@@ -133,21 +133,18 @@ static int mf6x4_do_insn_bits(struct comedi_device *dev, 
	return insn->n;

}



static int mf6x4_ai_wait_for_eoc(struct comedi_device *dev,

				 unsigned int timeout)

static int mf6x4_ai_eoc(struct comedi_device *dev,

			struct comedi_subdevice *s,

			struct comedi_insn *insn,

			unsigned long context)

{

	struct mf6x4_private *devpriv = dev->private;

	unsigned int eolc;

	unsigned int status;



	while (timeout--) {

		eolc = ioread32(devpriv->gpioc_R) & MF6X4_GPIOC_EOLC;

		if (eolc)

	status = ioread32(devpriv->gpioc_R);

	if (status & MF6X4_GPIOC_EOLC)

		return 0;



		udelay(1);

	}



	return -ETIME;

	return -EBUSY;

}



static int mf6x4_ai_insn_read(struct comedi_device *dev,
@@ -168,7 +165,7 @@ static int mf6x4_ai_insn_read(struct comedi_device *dev, 
		/* Trigger ADC conversion by reading ADSTART */

		ioread16(devpriv->bar1_mem + MF6X4_ADSTART_R);



		ret = mf6x4_ai_wait_for_eoc(dev, 100);

		ret = comedi_timeout(dev, s, insn, mf6x4_ai_eoc, 0);

		if (ret)

			return ret;