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

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

staging: comedi: me_daq: use comedi_dio_update_state() 



The extra mask used to only update the channels configured as outputs is
not necessary in this driver. Remove it and 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 b523c2b2

drivers/staging/comedi/drivers/me_daq.c

+2 −6
Original line number Diff line number Diff line
@@ -222,15 +222,11 @@ static int me_dio_insn_bits(struct comedi_device *dev, 
	struct me_private_data *dev_private = dev->private;

	void __iomem *mmio_porta = dev_private->me_regbase + ME_DIO_PORT_A;

	void __iomem *mmio_portb = dev_private->me_regbase + ME_DIO_PORT_B;

	unsigned int mask = data[0];

	unsigned int bits = data[1];

	unsigned int mask;

	unsigned int val;



	mask &= s->io_bits;	/* only update the COMEDI_OUTPUT channels */

	mask = comedi_dio_update_state(s, data);

	if (mask) {

		s->state &= ~mask;

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



		if (mask & 0x0000ffff)

			writew((s->state & 0xffff), mmio_porta);

		if (mask & 0xffff0000)