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

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

staging: comedi: hwdrv_apci3120: use comedi_dio_update_state() 



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

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 f6b316bc

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+6 −11
Original line number Diff line number Diff line
@@ -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;



	if (comedi_dio_update_state(s, data)) {

		/* 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;

		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;

}