AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-04 12:15:31 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: pcmuio: use comedi_handle_events()

Browse Source 
Use comedi_handle_events() to automatically (*cancel) the async command
for an end-of-acquisition or if an error/overflow occurs.

Also, comedi_handle_events() does nothing if no events are set so the
local variable 'oldevents' can be removed.

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-09-18 11:35:38 -07:00 committed by Greg Kroah-Hartman
parent c746db4e2b
commit bc43ae0662
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,7 +317,6 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
int asic = pcmuio_subdevice_to_asic(s); int asic = pcmuio_subdevice_to_asic(s);
struct pcmuio_asic *chip = &devpriv->asics[asic]; struct pcmuio_asic *chip = &devpriv->asics[asic];
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
unsigned oldevents = s->async->events;
unsigned int val = 0; unsigned int val = 0;
unsigned long flags; unsigned long flags;
unsigned int i; unsigned int i;
@ -339,31 +338,22 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
/* Write the scan to the buffer. */ /* Write the scan to the buffer. */
if (comedi_buf_put(s, val) && if (comedi_buf_put(s, val) &&
comedi_buf_put(s, val >> 16)) { comedi_buf_put(s, val >> 16))
s->async->events |= (COMEDI_CB_BLOCK | COMEDI_CB_EOS); s->async->events |= (COMEDI_CB_BLOCK | COMEDI_CB_EOS);
} else {
/* Overflow! Stop acquisition!! */
/* TODO: STOP_ACQUISITION_CALL_HERE!! */
pcmuio_stop_intr(dev, s);
}
/* Check for end of acquisition. */ /* Check for end of acquisition. */
if (cmd->stop_src == TRIG_COUNT) { if (cmd->stop_src == TRIG_COUNT) {
if (chip->stop_count > 0) { if (chip->stop_count > 0) {
chip->stop_count--; chip->stop_count--;
if (chip->stop_count == 0) { if (chip->stop_count == 0)
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
/* TODO: STOP_ACQUISITION_CALL_HERE!! */
pcmuio_stop_intr(dev, s);
}
} }
} }
done: done:
spin_unlock_irqrestore(&chip->spinlock, flags); spin_unlock_irqrestore(&chip->spinlock, flags);
if (oldevents != s->async->events) comedi_handle_events(dev, s);
comedi_event(dev, s);
} }
static int pcmuio_handle_asic_interrupt(struct comedi_device *dev, int asic) static int pcmuio_handle_asic_interrupt(struct comedi_device *dev, int asic)