From bf9fab836ff3012365ce167798bc0ce4bffe8cb1 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 30 Sep 2013 17:54:25 -0700 Subject: [PATCH] staging: comedi: ni_at_ao: tidy up atao_ao_rinsn() 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_at_ao.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c index 7ffa6c039bd6..b47eb9f4bb96 100644 --- a/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/drivers/staging/comedi/drivers/ni_at_ao.c @@ -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 */ -- 2.34.1