staging: comedi: dt282x: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

This also fixes two bugs.
  1) the analog input command is canceled due to a buffer overflow
     without sending an event (@@ -341,7 +340,7 @@).
  2) an analog output error causes the command to cancel but the event
     is reported to the analog input subdevice (@@ -449,15 +447,13 @@).

In the Kconfig, COMEDI_DT282X already selects COMEDI_FC.

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>

diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
index 6cc8f1d5b8315ad3d99d3249cf893e364a96c6ff..16cc100531e5dbdb879220c206001c2b8d18cbf7 100644 (file)
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -306,7 +306,6 @@ static void dt282x_ao_dma_interrupt(struct comedi_device *dev)
        size = cfc_read_array_from_buffer(s, ptr, devpriv->dma_maxsize);
        if (size == 0) {
                dev_err(dev->class_dev, "AO underrun\n");
-               dt282x_ao_cancel(dev, s);
                s->async->events |= COMEDI_CB_OVERFLOW;
                return;
        }
@@ -341,7 +340,7 @@ static void dt282x_ai_dma_interrupt(struct comedi_device *dev)
        dt282x_munge(dev, ptr, size);
        ret = cfc_write_array_to_buffer(s, ptr, size);
        if (ret != size) {
-               dt282x_ai_cancel(dev, s);
+               s->async->events |= COMEDI_CB_OVERFLOW;
                return;
        }
        devpriv->nread -= size / 2;
@@ -351,7 +350,6 @@ static void dt282x_ai_dma_interrupt(struct comedi_device *dev)
                devpriv->nread = 0;
        }
        if (!devpriv->nread) {
-               dt282x_ai_cancel(dev, s);
                s->async->events |= COMEDI_CB_EOA;
                return;
        }
@@ -449,15 +447,13 @@ static irqreturn_t dt282x_interrupt(int irq, void *d)
        if (adcsr & DT2821_ADERR) {
                if (devpriv->nread != 0) {
                        comedi_error(dev, "A/D error");
-                       dt282x_ai_cancel(dev, s);
                        s->async->events |= COMEDI_CB_ERROR;
                }
                handled = 1;
        }
        if (dacsr & DT2821_DAERR) {
                comedi_error(dev, "D/A error");
-               dt282x_ao_cancel(dev, s_ao);
-               s->async->events |= COMEDI_CB_ERROR;
+               s_ao->async->events |= COMEDI_CB_ERROR;
                handled = 1;
        }
 #if 0
@@ -486,7 +482,8 @@ static irqreturn_t dt282x_interrupt(int irq, void *d)
                handled = 1;
        }
 #endif
-       comedi_event(dev, s);
+       cfc_handle_events(dev, s);
+       cfc_handle_events(dev, s_ao);
 
        return IRQ_RETVAL(handled);
 }