staging: comedi: multiq3: use comedi_timeout() (f7d108f3) · Commits · 戴 / test

drivers/staging/comedi/drivers/multiq3.c

+24 −14

Original line number	Diff line number	Diff line
		@@ -81,34 +81,44 @@ struct multiq3_private {
		unsigned int ao_readback[2];
		};

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

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

		static int multiq3_ai_insn_read(struct comedi_device *dev,
		struct comedi_subdevice *s,
		struct comedi_insn insn, unsigned int data)
		{
		int i, n;
		int n;
		int chan;
		unsigned int hi, lo;
		int ret;

		chan = CR_CHAN(insn->chanspec);
		outw(MULTIQ3_CONTROL_MUST \| MULTIQ3_AD_MUX_EN \| (chan << 3),
		dev->iobase + MULTIQ3_CONTROL);

		for (i = 0; i < MULTIQ3_TIMEOUT; i++) {
		if (inw(dev->iobase + MULTIQ3_STATUS) & MULTIQ3_STATUS_EOC)
		break;
		}
		if (i == MULTIQ3_TIMEOUT)
		return -ETIMEDOUT;
		ret = comedi_timeout(dev, s, insn, multiq3_ai_status,
		MULTIQ3_STATUS_EOC);
		if (ret)
		return ret;

		for (n = 0; n < insn->n; n++) {
		outw(0, dev->iobase + MULTIQ3_AD_CS);
		for (i = 0; i < MULTIQ3_TIMEOUT; i++) {
		if (inw(dev->iobase +
		MULTIQ3_STATUS) & MULTIQ3_STATUS_EOC_I)
		break;
		}
		if (i == MULTIQ3_TIMEOUT)
		return -ETIMEDOUT;

		ret = comedi_timeout(dev, s, insn, multiq3_ai_status,
		MULTIQ3_STATUS_EOC_I);
		if (ret)
		return ret;

		hi = inb(dev->iobase + MULTIQ3_AD_CS);
		lo = inb(dev->iobase + MULTIQ3_AD_CS);