diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-05-14 14:23:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 16:25:56 -0700 |
| commit | 1c1f1d06a1ff6a2ab97cd849d7c0b4b613825fef (patch) | |
| tree | 94020999371f945d1daec7c8c28623e7e7bd7a7f /drivers/staging/comedi/drivers/dt9812.c | |
| parent | 51af6fa15e83f88fdd7de235db353f6a8b35513f (diff) | |
staging: comedi: dt9812: pass the comedi_device * to dt9812_digital_out_shadow()
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/dt9812.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/dt9812.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c index 96a1d860c1eb..59a2e9b4bd44 100644 --- a/drivers/staging/comedi/drivers/dt9812.c +++ b/drivers/staging/comedi/drivers/dt9812.c @@ -430,17 +430,20 @@ static int dt9812_digital_out(struct comedi_device *dev, u8 bits) 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); if (slot->usb) { *bits = slot->usb->digital_out_shadow; - result = 0; + ret = 0; } up(&slot->mutex); - return result; + + return ret; } 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, unsigned int *data) { - struct dt9812_private *devpriv = dev->private; unsigned int channel = CR_CHAN(insn->chanspec); int n; u8 bits = 0; - dt9812_digital_out_shadow(devpriv->slot, &bits); + dt9812_digital_out_shadow(dev, &bits); for (n = 0; n < insn->n; n++) { u8 mask = 1 << channel; |