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

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

staging: comedi: das1800: use comedi_timeout() 



Use the helper function to handle the busywaiting for the analog
input conversion to complete.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b1924b6

drivers/staging/comedi/drivers/das1800.c

+21 −13
Original line number Diff line number Diff line
@@ -937,6 +937,19 @@ static int das1800_ai_cmd(struct comedi_device *dev, 
	return 0;

}



static int das1800_ai_eoc(struct comedi_device *dev,

			  struct comedi_subdevice *s,

			  struct comedi_insn *insn,

			  unsigned long context)

{

	unsigned char status;



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

	if (status & FNE)

		return 0;

	return -EBUSY;

}



static int das1800_ai_insn_read(struct comedi_device *dev,

				struct comedi_subdevice *s,

				struct comedi_insn *insn,
@@ -944,8 +957,8 @@ static int das1800_ai_insn_read(struct comedi_device *dev, 
{

	unsigned int range = CR_RANGE(insn->chanspec);

	bool is_unipolar = comedi_range_is_unipolar(s, range);

	int i, n;

	int timeout = 1000;

	int ret = 0;

	int n;

	unsigned short dpnt;

	unsigned long flags;
@@ -966,24 +979,19 @@ static int das1800_ai_insn_read(struct comedi_device *dev, 
	for (n = 0; n < insn->n; n++) {

		/* trigger conversion */

		outb(0, dev->iobase + DAS1800_FIFO);

		for (i = 0; i < timeout; i++) {

			if (inb(dev->iobase + DAS1800_STATUS) & FNE)



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

		if (ret)

			break;

		}

		if (i == timeout) {

			dev_err(dev->class_dev, "timeout\n");

			n = -ETIME;

			goto exit;

		}



		dpnt = inw(dev->iobase + DAS1800_FIFO);

		if (!is_unipolar)

			dpnt = comedi_offset_munge(s, dpnt);

		data[n] = dpnt;

	}

exit:

	spin_unlock_irqrestore(&dev->spinlock, flags);



	return n;

	return ret ? ret : insn->n;

}



static int das1800_ao_insn_write(struct comedi_device *dev,