diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-10-24 16:34:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-24 19:35:50 -0700 |
| commit | 2e54209e0f9bbe9fb38869ff582a04cc86915975 (patch) | |
| tree | dee94e7f01eb2cfa8618439f7edd05b49964f86f /drivers | |
| parent | 87c4e2c62e507625af7cab5f46a019ab17d95bb7 (diff) | |
| download | lwn-2e54209e0f9bbe9fb38869ff582a04cc86915975.tar.gz lwn-2e54209e0f9bbe9fb38869ff582a04cc86915975.zip | |
staging: comedi: cb_pcidda: cleanup cb_pcidda_ao_winsn()
For aesthetic reasons, rename the function to help when searching
for 'insn_write' functions.
Remove the obvious comments and fix the return from the function.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidda.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c index 6b69e530ca72..0ad576b8f955 100644 --- a/drivers/staging/comedi/drivers/cb_pcidda.c +++ b/drivers/staging/comedi/drivers/cb_pcidda.c @@ -357,16 +357,16 @@ static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel, fine_gain_channel(channel), fine_gain); } -static int cb_pcidda_ao_winsn(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int cb_pcidda_ao_insn_write(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct cb_pcidda_private *devpriv = dev->private; unsigned int channel = CR_CHAN(insn->chanspec); unsigned int range = CR_RANGE(insn->chanspec); unsigned int ctrl; - /* adjust calibration dacs if range has changed */ if (range != devpriv->ao_range[channel]) cb_pcidda_calibrate(dev, channel, range); @@ -392,11 +392,9 @@ static int cb_pcidda_ao_winsn(struct comedi_device *dev, outw(ctrl, dev->iobase + CB_DDA_DA_CTRL_REG); - /* write data */ outw(data[0], dev->iobase + CB_DDA_DA_DATA_REG(channel)); - /* return the number of samples read/written */ - return 1; + return insn->n; } static const void *cb_pcidda_find_boardinfo(struct comedi_device *dev, @@ -451,7 +449,7 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev, s->n_chan = thisboard->ao_chans; s->maxdata = (1 << thisboard->ao_bits) - 1; s->range_table = &cb_pcidda_ranges; - s->insn_write = cb_pcidda_ao_winsn; + s->insn_write = cb_pcidda_ao_insn_write; /* two 8255 digital io subdevices */ for (i = 0; i < 2; i++) { |