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

staging: comedi: hwdrv_apci3120: use comedi_dio_update_state()

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

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:09:07 -07:00
committed by Greg Kroah-Hartman
parent f6b316bcd8
commit 2da43beab0
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@@ -2175,21 +2175,16 @@ static int apci3120_do_insn_bits(struct comedi_device *dev,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;
unsigned int mask = data[0];
unsigned int bits = data[1];
unsigned int val;
/* The do channels are bits 7:4 of the do register */
val = devpriv->b_DigitalOutputRegister >> 4;
if (mask) {
val &= ~mask;
val |= (bits & mask);
devpriv->b_DigitalOutputRegister = val << 4;
if (comedi_dio_update_state(s, data)) {
/* The do channels are bits 7:4 of the do register */
devpriv->b_DigitalOutputRegister = s->state << 4;
outb(val << 4, devpriv->iobase + APCI3120_DIGITAL_OUTPUT);
outb(devpriv->b_DigitalOutputRegister,
devpriv->iobase + APCI3120_DIGITAL_OUTPUT);
}
data[1] = val;
data[1] = s->state;
return insn->n;
}