Commit 2e54209e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 87c4e2c6
...@@ -357,16 +357,16 @@ static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel, ...@@ -357,16 +357,16 @@ static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel,
fine_gain_channel(channel), fine_gain); fine_gain_channel(channel), fine_gain);
} }
static int cb_pcidda_ao_winsn(struct comedi_device *dev, static int cb_pcidda_ao_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
struct cb_pcidda_private *devpriv = dev->private; struct cb_pcidda_private *devpriv = dev->private;
unsigned int channel = CR_CHAN(insn->chanspec); unsigned int channel = CR_CHAN(insn->chanspec);
unsigned int range = CR_RANGE(insn->chanspec); unsigned int range = CR_RANGE(insn->chanspec);
unsigned int ctrl; unsigned int ctrl;
/* adjust calibration dacs if range has changed */
if (range != devpriv->ao_range[channel]) if (range != devpriv->ao_range[channel])
cb_pcidda_calibrate(dev, channel, range); cb_pcidda_calibrate(dev, channel, range);
...@@ -392,11 +392,9 @@ static int cb_pcidda_ao_winsn(struct comedi_device *dev, ...@@ -392,11 +392,9 @@ static int cb_pcidda_ao_winsn(struct comedi_device *dev,
outw(ctrl, dev->iobase + CB_DDA_DA_CTRL_REG); outw(ctrl, dev->iobase + CB_DDA_DA_CTRL_REG);
/* write data */
outw(data[0], dev->iobase + CB_DDA_DA_DATA_REG(channel)); outw(data[0], dev->iobase + CB_DDA_DA_DATA_REG(channel));
/* return the number of samples read/written */ return insn->n;
return 1;
} }
static const void *cb_pcidda_find_boardinfo(struct comedi_device *dev, 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, ...@@ -451,7 +449,7 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
s->n_chan = thisboard->ao_chans; s->n_chan = thisboard->ao_chans;
s->maxdata = (1 << thisboard->ao_bits) - 1; s->maxdata = (1 << thisboard->ao_bits) - 1;
s->range_table = &cb_pcidda_ranges; 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 */ /* two 8255 digital io subdevices */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
......
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