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: das800: 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:04 -07:00
committed by Greg Kroah-Hartman
parent fe45e153d4
commit 90bc68ec9d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/comedi/drivers/das800.c
View File

@@ -556,15 +556,17 @@ static irqreturn_t das800_interrupt(int irq, void *d)
return IRQ_HANDLED;
}
static int das800_wait_for_conv(struct comedi_device *dev, int timeout)
static int das800_ai_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{
int i;
unsigned int status;
for (i = 0; i < timeout; i++) {
if (!(inb(dev->iobase + DAS800_STATUS) & BUSY))
return 0;
}
return -ETIME;
status = inb(dev->iobase + DAS800_STATUS);
if ((status & BUSY) == 0)
return 0;
return -EBUSY;
}
static int das800_ai_insn_read(struct comedi_device *dev,
@@ -599,7 +601,7 @@ static int das800_ai_insn_read(struct comedi_device *dev,
/* trigger conversion */
outb_p(0, dev->iobase + DAS800_MSB);
ret = das800_wait_for_conv(dev, 1000);
ret = comedi_timeout(dev, s, insn, das800_ai_eoc, 0);
if (ret)
return ret;