Skip to content

Commit

Permalink
staging: comedi: cb_pcidda: cleanup cb_pcidda_ao_winsn()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent 87c4e2c commit 2e54209
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/staging/comedi/drivers/cb_pcidda.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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,
Expand Down Expand Up @@ -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++) {
Expand Down

0 comments on commit 2e54209

Please sign in to comment.