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

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

staging: comedi: fl512: tidy up fl512_ao_insn_write() 



Tidy up this function. Only save the last value written for readback.

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 96653ed6

drivers/staging/comedi/drivers/fl512.c

+13 −12
Original line number Diff line number Diff line
@@ -76,20 +76,21 @@ static int fl512_ao_insn_write(struct comedi_device *dev, 
			       unsigned int *data)

{

	struct fl512_private *devpriv = dev->private;

	int n;

	int chan = CR_CHAN(insn->chanspec);	/* get chan to write */



	for (n = 0; n < insn->n; n++) {	/* write n data set */

		/* write low byte   */

		outb(data[n] & 0x0ff, dev->iobase + FL512_AO_DATA_REG(chan));

		/* write high byte  */

		outb((data[n] & 0xf00) >> 8,

		     dev->iobase + FL512_AO_DATA_REG(chan));

		inb(dev->iobase + FL512_AO_TRIG_REG(chan));

	unsigned int chan = CR_CHAN(insn->chanspec);

	unsigned int val = devpriv->ao_readback[chan];

	int i;



	for (i = 0; i < insn->n; i++) {

		val = data[i];



		devpriv->ao_readback[chan] = data[n];

		/* write LSB, MSB then trigger conversion */

		outb(val & 0x0ff, dev->iobase + FL512_AO_DATA_REG(chan));

		outb((val >> 8) & 0xf, dev->iobase + FL512_AO_DATA_REG(chan));

		inb(dev->iobase + FL512_AO_TRIG_REG(chan));

	}

	return n;

	devpriv->ao_readback[chan] = val;



	return insn->n;

}



static int fl512_ao_insn_read(struct comedi_device *dev,