staging: comedi: s526: use comedi_timeout() (043fff87) · Commits · 戴 / test

drivers/staging/comedi/drivers/s526.c

+20 −12

Original line number	Diff line number	Diff line
		@@ -420,15 +420,28 @@ static int s526_ai_insn_config(struct comedi_device *dev,
		return result;
		}

		static int s526_ai_eoc(struct comedi_device *dev,
		struct comedi_subdevice *s,
		struct comedi_insn *insn,
		unsigned long context)
		{
		unsigned int status;

		status = inw(dev->iobase + REG_ISR);
		if (status & ISR_ADC_DONE)
		return 0;
		return -EBUSY;
		}

		static int s526_ai_rinsn(struct comedi_device dev, struct comedi_subdevice s,
		struct comedi_insn insn, unsigned int data)
		{
		struct s526_private *devpriv = dev->private;
		unsigned int chan = CR_CHAN(insn->chanspec);
		int n, i;
		int n;
		unsigned short value;
		unsigned int d;
		unsigned int status;
		int ret;

		/* Set configured delay, enable channel for this channel only,
		* select "ADC read" channel, set "ADC start" bit. */
		@@ -440,17 +453,12 @@ static int s526_ai_rinsn(struct comedi_device dev, struct comedi_subdevice s,
		/* trigger conversion */
		outw(value, dev->iobase + REG_ADC);

		#define TIMEOUT 100
		/* wait for conversion to end */
		for (i = 0; i < TIMEOUT; i++) {
		status = inw(dev->iobase + REG_ISR);
		if (status & ISR_ADC_DONE) {
		ret = comedi_timeout(dev, s, insn, s526_ai_eoc, 0);
		if (ret)
		return ret;

		outw(ISR_ADC_DONE, dev->iobase + REG_ISR);
		break;
		}
		}
		if (i == TIMEOUT)
		return -ETIMEDOUT;

		/* read data */
		d = inw(dev->iobase + REG_ADD);