mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 05:39:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: mf6x4: 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:06 -07:00
committed by Greg Kroah-Hartman
parent 83b4d99125
commit acb069c041
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/comedi/drivers/mf6x4.c
View File

@@ -133,21 +133,18 @@ static int mf6x4_do_insn_bits(struct comedi_device *dev,
return insn->n;
}
static int mf6x4_ai_wait_for_eoc(struct comedi_device *dev,
unsigned int timeout)
static int mf6x4_ai_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{
struct mf6x4_private *devpriv = dev->private;
unsigned int eolc;
unsigned int status;
while (timeout--) {
eolc = ioread32(devpriv->gpioc_R) & MF6X4_GPIOC_EOLC;
if (eolc)
return 0;
udelay(1);
}
return -ETIME;
status = ioread32(devpriv->gpioc_R);
if (status & MF6X4_GPIOC_EOLC)
return 0;
return -EBUSY;
}
static int mf6x4_ai_insn_read(struct comedi_device *dev,
@@ -168,7 +165,7 @@ static int mf6x4_ai_insn_read(struct comedi_device *dev,
/* Trigger ADC conversion by reading ADSTART */
ioread16(devpriv->bar1_mem + MF6X4_ADSTART_R);
ret = mf6x4_ai_wait_for_eoc(dev, 100);
ret = comedi_timeout(dev, s, insn, mf6x4_ai_eoc, 0);
if (ret)
return ret;