Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 435efc8a authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: hwdrv_apci3120: use comedi_buf_write_samples() 



Use comedi_buf_write_samples() to add the samples to the async buffer.

The COMEDI_CB_EOS and COMEDI_CB_OVERFLOW events will be automatically
handled by the core. Remove the unecessary handling in 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 290d028e

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+6 −11
Original line number Diff line number Diff line
@@ -1313,18 +1313,13 @@ static int apci3120_interrupt_handle_eos(struct comedi_device *dev) 
{

	struct apci3120_private *devpriv = dev->private;

	struct comedi_subdevice *s = dev->read_subdev;

	int n_chan, i;

	int err = 1;



	n_chan = devpriv->ui_AiNbrofChannels;



	for (i = 0; i < n_chan; i++)

		err &= comedi_buf_put(s, inw(dev->iobase + 0));



	s->async->events |= COMEDI_CB_EOS;

	unsigned short val;

	int i;



	if (err == 0)

		s->async->events |= COMEDI_CB_OVERFLOW;

	for (i = 0; i < devpriv->ui_AiNbrofChannels; i++) {

		val = inw(dev->iobase + 0);

		comedi_buf_write_samples(s, &val, 1);

	}



	return 0;

}