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

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

staging: comedi: pcl711: 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 cf7b57fd

drivers/staging/comedi/drivers/pcl711.c

+10 −11
Original line number Original line Diff line number Diff line
@@ -253,18 +253,17 @@ static void pcl711_set_changain(struct comedi_device *dev, 
	outb(mux | PCL711_MUX_CHAN(chan), dev->iobase + PCL711_MUX_REG);

	outb(mux | PCL711_MUX_CHAN(chan), dev->iobase + PCL711_MUX_REG);

}

}





static int pcl711_ai_wait_for_eoc(struct comedi_device *dev,

static int pcl711_ai_eoc(struct comedi_device *dev,

				  unsigned int timeout)

			 struct comedi_subdevice *s,

			 struct comedi_insn *insn,

			 unsigned long context)

{

{

	unsigned int msb;

	unsigned int status;





	while (timeout--) {

	status = inb(dev->iobase + PCL711_AI_MSB_REG);

		msb = inb(dev->iobase + PCL711_AI_MSB_REG);

	if ((status & PCL711_AI_MSB_DRDY) == 0)

		if ((msb & PCL711_AI_MSB_DRDY) == 0)

		return 0;

		return 0;

		udelay(1);

	return -EBUSY;

	}

	return -ETIME;

}

}





static int pcl711_ai_insn_read(struct comedi_device *dev,

static int pcl711_ai_insn_read(struct comedi_device *dev,
@@ -282,7 +281,7 @@ static int pcl711_ai_insn_read(struct comedi_device *dev, 
	for (i = 0; i < insn->n; i++) {

	for (i = 0; i < insn->n; i++) {

		outb(PCL711_SOFTTRIG, dev->iobase + PCL711_SOFTTRIG_REG);

		outb(PCL711_SOFTTRIG, dev->iobase + PCL711_SOFTTRIG_REG);





		ret = pcl711_ai_wait_for_eoc(dev, 100);

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

		if (ret)

		if (ret)

			return ret;

			return ret;