redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: comedi: pcmad: 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:09 -07:00 committed by Greg Kroah-Hartman
parent 37e2b25f14
commit 42946cfc55
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/staging/comedi/drivers/pcmad.c
View file

@ -61,18 +61,17 @@ static const struct pcmad_board_struct pcmad_boards[] = {
},
};
#define TIMEOUT 100
static int pcmad_ai_wait_for_eoc(struct comedi_device *dev,
int timeout)
static int pcmad_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 + PCMAD_STATUS) & 0x3) == 0x3)
return 0;
}
return -ETIME;
status = inb(dev->iobase + PCMAD_STATUS);
if ((status & 0x3) == 0x3)
return 0;
return -EBUSY;
}
static int pcmad_ai_insn_read(struct comedi_device *dev,
@ -89,7 +88,7 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
for (i = 0; i < insn->n; i++) {
outb(chan, dev->iobase + PCMAD_CONVERT);
ret = pcmad_ai_wait_for_eoc(dev, TIMEOUT);
ret = comedi_timeout(dev, s, insn, pcmad_ai_eoc, 0);
if (ret)
return ret;