Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77e9487b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: usbdux drivers: use comedi_dio_update_state() 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18c93c36

drivers/staging/comedi/drivers/usbdux.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1133,15 +1133,13 @@ static int usbdux_dio_insn_bits(struct comedi_device *dev, 
{

{





	struct usbdux_private *devpriv = dev->private;

	struct usbdux_private *devpriv = dev->private;

	unsigned int mask = data[0];

	unsigned int bits = data[1];

	int ret;

	int ret;





	down(&devpriv->sem);

	down(&devpriv->sem);





	s->state &= ~mask;

	comedi_dio_update_state(s, data);

	s->state |= (bits & mask);





	/* Always update the hardware. See the (*insn_config). */

	devpriv->dux_commands[1] = s->io_bits;

	devpriv->dux_commands[1] = s->io_bits;

	devpriv->dux_commands[2] = s->state;

	devpriv->dux_commands[2] = s->state;

drivers/staging/comedi/drivers/usbduxsigma.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1059,15 +1059,13 @@ static int usbduxsigma_dio_insn_bits(struct comedi_device *dev, 
				     unsigned int *data)

				     unsigned int *data)

{

{

	struct usbduxsigma_private *devpriv = dev->private;

	struct usbduxsigma_private *devpriv = dev->private;

	unsigned int mask = data[0];

	unsigned int bits = data[1];

	int ret;

	int ret;





	down(&devpriv->sem);

	down(&devpriv->sem);





	s->state &= ~mask;

	comedi_dio_update_state(s, data);

	s->state |= (bits & mask);





	/* Always update the hardware. See the (*insn_config). */

	devpriv->dux_commands[1] = s->io_bits & 0xff;

	devpriv->dux_commands[1] = s->io_bits & 0xff;

	devpriv->dux_commands[4] = s->state & 0xff;

	devpriv->dux_commands[4] = s->state & 0xff;

	devpriv->dux_commands[2] = (s->io_bits >> 8) & 0xff;

	devpriv->dux_commands[2] = (s->io_bits >> 8) & 0xff;