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

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

staging: comedi: mpc624: 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 65a1c97f

drivers/staging/comedi/drivers/mpc624.c

+16 −12
Original line number Diff line number Diff line
@@ -142,8 +142,18 @@ static const struct comedi_lrange range_mpc624_bipolar10 = { 
	 }

};



/* Timeout 200ms */

#define TIMEOUT 200

static int mpc624_ai_eoc(struct comedi_device *dev,

			 struct comedi_subdevice *s,

			 struct comedi_insn *insn,

			 unsigned long context)

{

	unsigned char status;



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

	if ((status & MPC624_ADBUSY) == 0)

		return 0;

	return -EBUSY;

}



static int mpc624_ai_rinsn(struct comedi_device *dev,

			   struct comedi_subdevice *s, struct comedi_insn *insn,
@@ -152,7 +162,7 @@ static int mpc624_ai_rinsn(struct comedi_device *dev, 
	struct mpc624_private *devpriv = dev->private;

	int n, i;

	unsigned long int data_in, data_out;

	unsigned char ucPort;

	int ret;



	/*

	 *  WARNING:
@@ -170,15 +180,9 @@ static int mpc624_ai_rinsn(struct comedi_device *dev, 
		udelay(1);



		/*  Wait for the conversion to end */

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

			ucPort = inb(dev->iobase + MPC624_ADC);

			if (ucPort & MPC624_ADBUSY)

				udelay(1000);

			else

				break;

		}

		if (i == TIMEOUT)

			return -ETIMEDOUT;

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

		if (ret)

			return ret;



		/*  Start reading data */

		data_in = 0;