Commit 95bee441 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: 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 1c4babb2
...@@ -278,27 +278,29 @@ static int pcl711_ai_wait_for_eoc(struct comedi_device *dev, ...@@ -278,27 +278,29 @@ static int pcl711_ai_wait_for_eoc(struct comedi_device *dev,
return -ETIME; return -ETIME;
} }
static int pcl711_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, static int pcl711_ai_insn_read(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{ {
int ret; int ret;
int n; int i;
pcl711_set_changain(dev, insn->chanspec); pcl711_set_changain(dev, insn->chanspec);
pcl711_ai_set_mode(dev, PCL711_MODE_SOFTTRIG); 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); outb(PCL711_SOFTTRIG, dev->iobase + PCL711_SOFTTRIG_REG);
ret = pcl711_ai_wait_for_eoc(dev, 100); ret = pcl711_ai_wait_for_eoc(dev, 100);
if (ret) if (ret)
return 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, 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) ...@@ -530,7 +532,7 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->n_chan = board->n_aichan; s->n_chan = board->n_aichan;
s->maxdata = 0xfff; s->maxdata = 0xfff;
s->range_table = board->ai_range_type; s->range_table = board->ai_range_type;
s->insn_read = pcl711_ai_insn; s->insn_read = pcl711_ai_insn_read;
if (dev->irq) { if (dev->irq) {
dev->read_subdev = s; dev->read_subdev = s;
s->subdev_flags |= SDF_CMD_READ; s->subdev_flags |= SDF_CMD_READ;
......
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