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_digital_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:23:57 -07:00 • committed by Greg Kroah-Hartman
parent 51af6fa15e
commit 1c1f1d06a1
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -430,17 +430,20 @@ static int dt9812_digital_out(struct comedi_device *dev, u8 bits)
return ret; return ret;
} }
static int dt9812_digital_out_shadow(struct slot_dt9812 *slot, u8 *bits) static int dt9812_digital_out_shadow(struct comedi_device *dev, u8 *bits)
{ {
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) {
*bits = slot->usb->digital_out_shadow; *bits = slot->usb->digital_out_shadow;
result = 0; ret = 0;
} }
up(&slot->mutex); up(&slot->mutex);
return result;
return ret;
} }
static void dt9812_configure_mux(struct usb_dt9812 *dev, static void dt9812_configure_mux(struct usb_dt9812 *dev,
@ -658,12 +661,11 @@ static int dt9812_do_winsn(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;
u8 bits = 0; u8 bits = 0;
dt9812_digital_out_shadow(devpriv->slot, &bits); dt9812_digital_out_shadow(dev, &bits);
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
u8 mask = 1 << channel; u8 mask = 1 << channel;