Commit 51af6fa1 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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

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'.

Also, initialize the 'reg', and 'value' when they are declared.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bc839f2
...@@ -411,23 +411,23 @@ static int dt9812_digital_in(struct comedi_device *dev, u8 *bits) ...@@ -411,23 +411,23 @@ static int dt9812_digital_in(struct comedi_device *dev, u8 *bits)
return ret; return ret;
} }
static int dt9812_digital_out(struct slot_dt9812 *slot, u8 bits) static int dt9812_digital_out(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) {
u8 reg[1]; u8 reg[1] = { F020_SFR_P2 };
u8 value[1]; u8 value[1] = { bits };
reg[0] = F020_SFR_P2; ret = dt9812_write_multiple_registers(slot->usb, 1, reg, value);
value[0] = bits;
result = dt9812_write_multiple_registers(slot->usb, 1, reg,
value);
slot->usb->digital_out_shadow = bits; slot->usb->digital_out_shadow = bits;
} }
up(&slot->mutex); up(&slot->mutex);
return result;
return ret;
} }
static int dt9812_digital_out_shadow(struct slot_dt9812 *slot, u8 *bits) static int dt9812_digital_out_shadow(struct slot_dt9812 *slot, u8 *bits)
...@@ -671,7 +671,7 @@ static int dt9812_do_winsn(struct comedi_device *dev, ...@@ -671,7 +671,7 @@ static int dt9812_do_winsn(struct comedi_device *dev,
if (data[n]) if (data[n])
bits |= mask; bits |= mask;
} }
dt9812_digital_out(devpriv->slot, bits); dt9812_digital_out(dev, bits);
return n; return n;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment