From 95bee441c901277c2082e09b44a83d4cf57c179c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 20 Sep 2013 16:41:57 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/pcl711.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c index f8401b738f1a..837505935277 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; -- 2.30.2