forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: usbdux drivers: use comedi_dio_update_state()

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

These drivers always need to update the hardware in order to update
the i/o configuration regardless of if the state has changed.

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:05:38 -07:00 • committed by Greg Kroah-Hartman
commit 77e9487bdb
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/comedi/drivers/usbdux.c
View file

@ -1133,15 +1133,13 @@ static int usbdux_dio_insn_bits(struct comedi_device *dev,
{
struct usbdux_private *devpriv = dev->private;
unsigned int mask = data[0];
unsigned int bits = data[1];
int ret;
down(&devpriv->sem);
s->state &= ~mask;
s->state |= (bits & mask);
comedi_dio_update_state(s, data);
/* Always update the hardware. See the (*insn_config). */
devpriv->dux_commands[1] = s->io_bits;
devpriv->dux_commands[2] = s->state;

6
drivers/staging/comedi/drivers/usbduxsigma.c
View file

@ -1059,15 +1059,13 @@ static int usbduxsigma_dio_insn_bits(struct comedi_device *dev,
unsigned int *data)
{
struct usbduxsigma_private *devpriv = dev->private;
unsigned int mask = data[0];
unsigned int bits = data[1];
int ret;
down(&devpriv->sem);
s->state &= ~mask;
s->state |= (bits & mask);
comedi_dio_update_state(s, data);
/* Always update the hardware. See the (*insn_config). */
devpriv->dux_commands[1] = s->io_bits & 0xff;
devpriv->dux_commands[4] = s->state & 0xff;
devpriv->dux_commands[2] = (s->io_bits >> 8) & 0xff;