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

staging: comedi: dt9812: pass the comedi_device * to dt9812_analog_out_shadow()

Browse source 
For aesthetic reasons, instead of passing the 'slot' pointer, pass the
comedi_device pointer to this function and rename the local var 'result'
to simply 'ret'.

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>
This commit is contained in:
H Hartley Sweeten 2013-05-14 14:27:16 -07:00 • committed by Greg Kroah-Hartman
parent 387d487950
commit fad1c32076
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/comedi/drivers/dt9812.c
View file

@ -588,19 +588,21 @@ exit:
return ret; return ret;
} }
static int dt9812_analog_out_shadow(struct slot_dt9812 *slot, int channel, static int dt9812_analog_out_shadow(struct comedi_device *dev,
u16 *value) int channel, u16 *value)
{ {
int result = -ENODEV; struct dt9812_private *devpriv = dev->private;
struct slot_dt9812 *slot = devpriv->slot;
int ret = -ENODEV;
down(&slot->mutex); down(&slot->mutex);
if (slot->usb) { if (slot->usb) {
*value = slot->usb->analog_out_shadow[channel]; *value = slot->usb->analog_out_shadow[channel];
result = 0; ret = 0;
} }
up(&slot->mutex); up(&slot->mutex);
return result; return ret;
} }
static int dt9812_analog_out(struct comedi_device *dev, int channel, u16 value) static int dt9812_analog_out(struct comedi_device *dev, int channel, u16 value)
@ -712,14 +714,13 @@ static int dt9812_ao_rinsn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn, struct comedi_subdevice *s, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
struct dt9812_private *devpriv = dev->private;
unsigned int channel = CR_CHAN(insn->chanspec); unsigned int channel = CR_CHAN(insn->chanspec);
int n; int n;
u16 value; u16 value;
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
value = 0; value = 0;
dt9812_analog_out_shadow(devpriv->slot, channel, &value); dt9812_analog_out_shadow(dev, channel, &value);
data[n] = value; data[n] = value;
} }
return n; return n;