evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: pcmmio: tidy up ao_rinsn()

Browse source 
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-12-09 15:30:49 -07:00 • committed by Greg Kroah-Hartman
parent 6f216c966c
commit 7af64f9acb
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/staging/comedi/drivers/pcmmio.c
View file

@ -879,18 +879,19 @@ static int pcmmio_ai_insn_read(struct comedi_device *dev,
return insn->n;
}
static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
static int pcmmio_ao_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct pcmmio_private *devpriv = dev->private;
int n;
unsigned int chan = CR_CHAN(insn->chanspec);
int i;
for (n = 0; n < insn->n; n++) {
unsigned chan = CR_CHAN(insn->chanspec);
if (chan < s->n_chan)
data[n] = devpriv->ao_readback[chan];
}
return n;
for (i = 0; i < insn->n; i++)
data[i] = devpriv->ao_readback[chan];
return insn->n;
}
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)
s->type = COMEDI_SUBD_AO;
s->n_chan = 8;
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;
/* initialize the resource enable register by clearing it */