Commit aa96f6ef authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: dt3000: use comedi_buf_write_samples()

For aesthetics, use comedi_buf_write_samples() to add the sample to the
async buffer.

The core will set the COMEDi_CB_BLOCK event when data is written to the
async buffer. Remove the unnecessary event from the driver.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1700529b
...@@ -315,7 +315,7 @@ static void dt3k_ai_empty_fifo(struct comedi_device *dev, ...@@ -315,7 +315,7 @@ static void dt3k_ai_empty_fifo(struct comedi_device *dev,
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
data = readw(dev->mmio + DPR_ADC_buffer + rear); data = readw(dev->mmio + DPR_ADC_buffer + rear);
comedi_buf_put(s, data); comedi_buf_write_samples(s, &data, 1);
rear++; rear++;
if (rear >= AI_FIFO_DEPTH) if (rear >= AI_FIFO_DEPTH)
rear = 0; rear = 0;
...@@ -351,10 +351,8 @@ static irqreturn_t dt3k_interrupt(int irq, void *d) ...@@ -351,10 +351,8 @@ static irqreturn_t dt3k_interrupt(int irq, void *d)
status = readw(dev->mmio + DPR_Intr_Flag); status = readw(dev->mmio + DPR_Intr_Flag);
if (status & DT3000_ADFULL) { if (status & DT3000_ADFULL)
dt3k_ai_empty_fifo(dev, s); dt3k_ai_empty_fifo(dev, s);
s->async->events |= COMEDI_CB_BLOCK;
}
if (status & (DT3000_ADSWERR | DT3000_ADHWERR)) if (status & (DT3000_ADSWERR | DT3000_ADHWERR))
s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA; s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment