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

staging: comedi: pcmmio: tidy up ao_rinsn()

Rename this function so it has namespace associated with the driver.

Move the 'chan' local variable out of the for () loop. The 'chan' is
constant for the comedi_insn and only needs to be fetched once from
the insn->chanspec.

Also, remove the sanity check of the chan. The comedi core will ensure
that the chan is valid for the subdevice before calling this function.
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 6f216c96
...@@ -879,18 +879,19 @@ static int pcmmio_ai_insn_read(struct comedi_device *dev, ...@@ -879,18 +879,19 @@ static int pcmmio_ai_insn_read(struct comedi_device *dev,
return insn->n; return insn->n;
} }
static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, static int pcmmio_ao_insn_read(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{ {
struct pcmmio_private *devpriv = dev->private; struct pcmmio_private *devpriv = dev->private;
int n; unsigned int chan = CR_CHAN(insn->chanspec);
int i;
for (n = 0; n < insn->n; n++) { for (i = 0; i < insn->n; i++)
unsigned chan = CR_CHAN(insn->chanspec); data[i] = devpriv->ao_readback[chan];
if (chan < s->n_chan)
data[n] = devpriv->ao_readback[chan]; return insn->n;
}
return n;
} }
static int pcmmio_ao_wait_for_eoc(unsigned long iobase, unsigned int timeout) static int pcmmio_ao_wait_for_eoc(unsigned long iobase, unsigned int timeout)
...@@ -1023,7 +1024,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1023,7 +1024,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->n_chan = 8; s->n_chan = 8;
s->len_chanlist = s->n_chan; s->len_chanlist = s->n_chan;
s->insn_read = ao_rinsn; s->insn_read = pcmmio_ao_insn_read;
s->insn_write = pcmmio_ao_insn_write; s->insn_write = pcmmio_ao_insn_write;
/* initialize the resource enable register by clearing it */ /* initialize the resource enable register by clearing it */
......
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