diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-09-18 18:35:33 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-20 02:29:24 (GMT) |
| commit | 066021912a40c1ae76e696f24f87451becb7612b (patch) | |
| tree | db2543c24418576e7e95ce58f6bb6f8527206eb0 | |
| parent | 7ff4b5847c7063c2f60bd1c40f59160389ae2449 (diff) | |
| download | linux-066021912a40c1ae76e696f24f87451becb7612b.tar.xz | |
staging: comedi: amplc_dio200_common: use comedi_handle_events()
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_dio200_common.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_dio200_common.c b/drivers/staging/comedi/drivers/amplc_dio200_common.c index 2c1bfb0..944d454 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200_common.c +++ b/drivers/staging/comedi/drivers/amplc_dio200_common.c @@ -272,7 +272,6 @@ static void dio200_read_scan_intr(struct comedi_device *dev, s->async->events |= (COMEDI_CB_BLOCK | COMEDI_CB_EOS); } else { /* Error! Stop acquisition. */ - dio200_stop_intr(dev, s); s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW; dev_err(dev->class_dev, "buffer overflow\n"); } @@ -281,10 +280,8 @@ static void dio200_read_scan_intr(struct comedi_device *dev, if (cmd->stop_src == TRIG_COUNT) { if (subpriv->stopcount > 0) { subpriv->stopcount--; - if (subpriv->stopcount == 0) { + if (subpriv->stopcount == 0) s->async->events |= COMEDI_CB_EOA; - dio200_stop_intr(dev, s); - } } } } @@ -297,13 +294,11 @@ static int dio200_handle_read_intr(struct comedi_device *dev, unsigned triggered; unsigned intstat; unsigned cur_enabled; - unsigned int oldevents; unsigned long flags; triggered = 0; spin_lock_irqsave(&subpriv->spinlock, flags); - oldevents = s->async->events; if (board->has_int_sce) { /* * Collect interrupt sources that have triggered and disable @@ -356,8 +351,7 @@ static int dio200_handle_read_intr(struct comedi_device *dev, } spin_unlock_irqrestore(&subpriv->spinlock, flags); - if (oldevents != s->async->events) - comedi_event(dev, s); + comedi_handle_events(dev, s); return (triggered != 0); } |