From 7af64f9acb2b13f24dfbb1c0aac91229671314d6 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 9 Dec 2013 15:30:49 -0700 Subject: [PATCH] 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: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/pcmmio.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index d51fa69a89ac..9338f0c95f9f 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c @@ -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 */ -- 2.30.2