evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_670x: cleanup ni_670x_ao_winsn()

Browse source 
For aesthetics, rename this function and tidy it up a bit.

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>
This commit is contained in:
H Hartley Sweeten 2014-08-25 16:04:44 -07:00 • committed by Greg Kroah-Hartman
parent b328ad3075
commit d34b3d41cc
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/staging/comedi/drivers/ni_670x.c
View file

@ -86,35 +86,37 @@ struct ni_670x_private {
unsigned int ao_readback[32];
};
static int ni_670x_ao_winsn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
static int ni_670x_ao_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct ni_670x_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int val = devpriv->ao_readback[chan];
int i;
int chan = CR_CHAN(insn->chanspec);
/* Channel number mapping :
NI 6703/ NI 6704 | NI 6704 Only
----------------------------------------------------
vch(0) : 0 | ich(16) : 1
vch(1) : 2 | ich(17) : 3
. : . | . .
. : . | . .
. : . | . .
vch(15) : 30 | ich(31) : 31 */
/*
* Channel number mapping:
*
* NI 6703/ NI 6704 | NI 6704 Only
* -------------------------------
* vch(0) : 0 | ich(16) : 1
* vch(1) : 2 | ich(17) : 3
* ... | ...
* vch(15) : 30 | ich(31) : 31
*/
for (i = 0; i < insn->n; i++) {
val = data[i];
/* First write in channel register which channel to use */
writel(((chan & 15) << 1) | ((chan & 16) >> 4),
dev->mmio + AO_CHAN_OFFSET);
/* write channel value */
writel(data[i], dev->mmio + AO_VALUE_OFFSET);
devpriv->ao_readback[chan] = data[i];
writel(val, dev->mmio + AO_VALUE_OFFSET);
}
devpriv->ao_readback[chan] = val;
return i;
return insn->n;
}
static int ni_670x_ao_rinsn(struct comedi_device *dev,
@ -241,7 +243,7 @@ static int ni_670x_auto_attach(struct comedi_device *dev,
} else {
s->range_table = &range_bipolar10;
}
s->insn_write = &ni_670x_ao_winsn;
s->insn_write = ni_670x_ao_insn_write;
s->insn_read = &ni_670x_ao_rinsn;
s = &dev->subdevices[1];