openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: pcmuio: use comedi_async 'scans_done' to detect EOA 

Remove the private data member 'stop_count' and use the comedi_async 'scans_done'
member to detect the end-of-acquisition.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-11-05 10:21:02 -07:00 committed by Greg Kroah-Hartman
parent 09959d658c
commit b03130b649
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/comedi/drivers/pcmuio.c
View File

@ -130,7 +130,6 @@ struct pcmuio_asic {
spinlock_t pagelock; /* protects the page registers */ spinlock_t pagelock; /* protects the page registers */
spinlock_t spinlock; /* protects member variables */ spinlock_t spinlock; /* protects member variables */
unsigned int enabled_mask; unsigned int enabled_mask;
unsigned int stop_count;
unsigned int active:1; unsigned int active:1;
}; };
@ -338,14 +337,9 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
comedi_buf_write_samples(s, &val, 1); comedi_buf_write_samples(s, &val, 1);
/* Check for end of acquisition. */ if (cmd->stop_src == TRIG_COUNT &&
if (cmd->stop_src == TRIG_COUNT) { s->async->scans_done >= cmd->stop_arg)
if (chip->stop_count > 0) { s->async->events |= COMEDI_CB_EOA;
chip->stop_count--;
if (chip->stop_count == 0)
s->async->events |= COMEDI_CB_EOA;
}
}
done: done:
spin_unlock_irqrestore(&chip->spinlock, flags); spin_unlock_irqrestore(&chip->spinlock, flags);
@ -474,8 +468,6 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
spin_lock_irqsave(&chip->spinlock, flags); spin_lock_irqsave(&chip->spinlock, flags);
chip->active = 1; chip->active = 1;
chip->stop_count = cmd->stop_arg;
/* Set up start of acquisition. */ /* Set up start of acquisition. */
if (cmd->start_src == TRIG_INT) if (cmd->start_src == TRIG_INT)
s->async->inttrig = pcmuio_inttrig_start_intr; s->async->inttrig = pcmuio_inttrig_start_intr;