diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-09-20 23:41:57 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 23:00:00 (GMT) |
| commit | 95bee441c901277c2082e09b44a83d4cf57c179c (patch) | |
| tree | 27c6c989313590ea8334439551176e460e838a2b | |
| parent | 1c4babb2464d0af65ebc0165d2a93ac9f7b9554b (diff) | |
| download | linux-fsl-qoriq-95bee441c901277c2082e09b44a83d4cf57c179c.tar.xz | |
staging: comedi: pcl711: tidy up pcl711_ai_insn()
For aesthetic reasons, rename this function to help with greps.
Tidy up the function a bit to follow the comedi driver norm.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl711.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c index f8401b7..8375059 100644 --- a/drivers/staging/comedi/drivers/pcl711.c +++ b/drivers/staging/comedi/drivers/pcl711.c @@ -278,27 +278,29 @@ static int pcl711_ai_wait_for_eoc(struct comedi_device *dev, return -ETIME; } -static int pcl711_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int pcl711_ai_insn_read(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { int ret; - int n; + int i; pcl711_set_changain(dev, insn->chanspec); pcl711_ai_set_mode(dev, PCL711_MODE_SOFTTRIG); - for (n = 0; n < insn->n; n++) { + for (i = 0; i < insn->n; i++) { outb(PCL711_SOFTTRIG, dev->iobase + PCL711_SOFTTRIG_REG); ret = pcl711_ai_wait_for_eoc(dev, 100); if (ret) return ret; - data[n] = pcl711_ai_get_sample(dev, s); + data[i] = pcl711_ai_get_sample(dev, s); } - return n; + return insn->n; } static int pcl711_ai_cmdtest(struct comedi_device *dev, @@ -530,7 +532,7 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->n_chan = board->n_aichan; s->maxdata = 0xfff; s->range_table = board->ai_range_type; - s->insn_read = pcl711_ai_insn; + s->insn_read = pcl711_ai_insn_read; if (dev->irq) { dev->read_subdev = s; s->subdev_flags |= SDF_CMD_READ; |