evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: mpc624: use comedi_timeout()

Browse source 
Use comedi_timeout() to wait for the analog input end-of-conversion.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-02-10 11:49:22 -07:00 • committed by Greg Kroah-Hartman
parent 65a1c97f1e
commit 3d21960b6d
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/staging/comedi/drivers/mpc624.c
View file

@ -142,8 +142,18 @@ static const struct comedi_lrange range_mpc624_bipolar10 = {
} }
}; };
/* Timeout 200ms */ static int mpc624_ai_eoc(struct comedi_device *dev,
#define TIMEOUT 200 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, static int mpc624_ai_rinsn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn, 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; struct mpc624_private *devpriv = dev->private;
int n, i; int n, i;
unsigned long int data_in, data_out; unsigned long int data_in, data_out;
unsigned char ucPort; int ret;
/* /*
* WARNING: * WARNING:
@ -170,15 +180,9 @@ static int mpc624_ai_rinsn(struct comedi_device *dev,
udelay(1); udelay(1);
/* Wait for the conversion to end */ /* Wait for the conversion to end */
for (i = 0; i < TIMEOUT; i++) { ret = comedi_timeout(dev, s, insn, mpc624_ai_eoc, 0);
ucPort = inb(dev->iobase + MPC624_ADC); if (ret)
if (ucPort & MPC624_ADBUSY) return ret;
udelay(1000);
else
break;
}
if (i == TIMEOUT)
return -ETIMEDOUT;
/* Start reading data */ /* Start reading data */
data_in = 0; data_in = 0;