mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 18:42:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: vmk80xx: use comedi_dio_update_state()

Browse Source 
Use comedi_dio_update_state() to handle the boilerplate code to update
the subdevice s->state.

Tidy up the vmk80xx_do_insn_bits() function 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
2013-08-30 11:06:58 -07:00
committed by Greg Kroah-Hartman
parent 6171667a81
commit 6f617e544b
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/comedi/drivers/vmk80xx.c
View File

@@ -462,9 +462,10 @@ static int vmk80xx_do_insn_bits(struct comedi_device *dev,
unsigned int *data)
{
struct vmk80xx_private *devpriv = dev->private;
unsigned char *rx_buf, *tx_buf;
unsigned char *rx_buf = devpriv->usb_rx_buf;
unsigned char *tx_buf = devpriv->usb_tx_buf;
int reg, cmd;
int retval;
int ret;
if (devpriv->model == VMK8061_MODEL) {
reg = VMK8061_DO_REG;
@@ -476,37 +477,27 @@ static int vmk80xx_do_insn_bits(struct comedi_device *dev,
down(&devpriv->limit_sem);
rx_buf = devpriv->usb_rx_buf;
tx_buf = devpriv->usb_tx_buf;
if (data[0]) {
tx_buf[reg] &= ~data[0];
tx_buf[reg] |= (data[0] & data[1]);
retval = vmk80xx_write_packet(dev, cmd);
if (retval)
if (comedi_dio_update_state(s, data)) {
tx_buf[reg] = s->state;
ret = vmk80xx_write_packet(dev, cmd);
if (ret)
goto out;
}
if (devpriv->model == VMK8061_MODEL) {
tx_buf[0] = VMK8061_CMD_RD_DO;
retval = vmk80xx_read_packet(dev);
if (!retval) {
data[1] = rx_buf[reg];
retval = 2;
}
ret = vmk80xx_read_packet(dev);
if (ret)
goto out;
data[1] = rx_buf[reg];
} else {
data[1] = tx_buf[reg];
retval = 2;
data[1] = s->state;
}
out:
up(&devpriv->limit_sem);
return retval;
return ret ? ret : insn->n;
}
static int vmk80xx_cnt_insn_read(struct comedi_device *dev,