]> Pileus Git - ~andy/linux/commitdiff
staging: comedi: ni_at_ao: tidy up atao_ao_rinsn()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 1 Oct 2013 00:54:25 +0000 (17:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Oct 2013 21:04:50 +0000 (14:04 -0700)
For aesthetics, rename this function to help with greps.

Tidy up this function to follow the normal format for analog
output read back functions.

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>
drivers/staging/comedi/drivers/ni_at_ao.c

index 7ffa6c039bd6dcb5922544aafd651188bc1767e7..b47eb9f4bb965beabcb2024f79e42f1fdab9037a 100644 (file)
@@ -163,17 +163,19 @@ static int atao_ao_insn_write(struct comedi_device *dev,
        return insn->n;
 }
 
-static int atao_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
-                        struct comedi_insn *insn, unsigned int *data)
+static int atao_ao_insn_read(struct comedi_device *dev,
+                            struct comedi_subdevice *s,
+                            struct comedi_insn *insn,
+                            unsigned int *data)
 {
        struct atao_private *devpriv = dev->private;
+       unsigned int chan = CR_CHAN(insn->chanspec);
        int i;
-       int chan = CR_CHAN(insn->chanspec);
 
        for (i = 0; i < insn->n; i++)
                data[i] = devpriv->ao_readback[chan];
 
-       return i;
+       return insn->n;
 }
 
 static int atao_dio_insn_bits(struct comedi_device *dev,
@@ -366,7 +368,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        else
                s->range_table = &range_bipolar10;
        s->insn_write = atao_ao_insn_write;
-       s->insn_read = &atao_ao_rinsn;
+       s->insn_read = atao_ao_insn_read;
 
        s = &dev->subdevices[1];
        /* digital i/o subdevice */