From: H Hartley Sweeten Date: Wed, 22 Oct 2014 22:37:05 +0000 (-0700) Subject: staging: comedi: quatech_daqp_cs: use comedi_buf_write_samples() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a4a68fe2a264778d1452b64964ebf65670ef774d;p=linux-beck.git staging: comedi: quatech_daqp_cs: use comedi_buf_write_samples() For aesthetics, use comedi_buf_write_samples() to add the sample to the async buffer. The core will add the COMEDI_CB_BLOCK event when data is written to the async buffer. Remove the unnecessary event in the driver. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 21e99fdf28ad..f6c678eef8d5 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -221,7 +221,7 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id) data |= inb(dev->iobase + DAQP_FIFO) << 8; data ^= 0x8000; - comedi_buf_put(s, data); + comedi_buf_write_samples(s, &data, 1); /* If there's a limit, decrement it * and stop conversion if zero @@ -245,8 +245,6 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id) s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; } - s->async->events |= COMEDI_CB_BLOCK; - comedi_handle_events(dev, s); } return IRQ_HANDLED;