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

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

staging: comedi: ni_mio_common: use comedi_subdevice 'readback' 



Use the new comedi_subdevice 'readback' member and the core provided
(*insn_read) for the readback of the analog output subdevice channels.

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 4b01383a

drivers/staging/comedi/drivers/ni_mio_common.c

+7 −18
Original line number Diff line number Diff line
@@ -2918,21 +2918,6 @@ static int ni_ao_config_chanlist(struct comedi_device *dev, 
		return ni_old_ao_config_chanlist(dev, s, chanspec, n_chans);

}



static int ni_ao_insn_read(struct comedi_device *dev,

			   struct comedi_subdevice *s,

			   struct comedi_insn *insn,

			   unsigned int *data)

{

	struct ni_private *devpriv = dev->private;

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

	int i;



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

		data[i] = devpriv->ao[chan];



	return insn->n;

}



static int ni_ao_insn_write(struct comedi_device *dev,

			    struct comedi_subdevice *s,

			    struct comedi_insn *insn,
@@ -2959,7 +2944,7 @@ static int ni_ao_insn_write(struct comedi_device *dev, 
	for (i = 0; i < insn->n; i++) {

		unsigned int val = data[i];



		devpriv->ao[chan] = val;

		s->readback[chan] = val;



		if (devpriv->is_6xxx) {

			/*
@@ -5485,9 +5470,13 @@ static int ni_E_init(struct comedi_device *dev, 
		s->n_chan	= board->n_aochan;

		s->maxdata	= board->ao_maxdata;

		s->range_table	= board->ao_range_table;

		s->insn_read	= ni_ao_insn_read;

		s->insn_write	= ni_ao_insn_write;

		s->insn_config	= ni_ao_insn_config;

		s->insn_write	= ni_ao_insn_write;

		s->insn_read	= comedi_readback_insn_read;



		ret = comedi_alloc_subdev_readback(s);

		if (ret)

			return ret;



		/*

		 * Along with the IRQ we need either a FIFO or DMA for

drivers/staging/comedi/drivers/ni_stc.h

+0 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,6 @@ struct ni_private { 
	unsigned int changain_spec;



	unsigned int caldac_maxdata_list[MAX_N_CALDACS];

	unsigned short ao[MAX_N_AO_CHAN];

	unsigned short caldacs[MAX_N_CALDACS];



	unsigned short ai_cmd2;