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

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

staging: comedi: adq12b: remove digital_state from private data 



Use the subdevice 'state' variable instead of carrying the state of
the output channels in the private data.

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 e49242a4

drivers/staging/comedi/drivers/adq12b.c

+16 −16
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ struct adq12b_private { 
	int differential;	/* option 3 of comedi_config */

	int last_channel;

	int last_range;

	unsigned int digital_state;

};



/*
@@ -186,23 +185,25 @@ static int adq12b_di_insn_bits(struct comedi_device *dev, 


static int adq12b_do_insn_bits(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data)

			       struct comedi_insn *insn,

			       unsigned int *data)

{

	struct adq12b_private *devpriv = dev->private;

	int channel;



	for (channel = 0; channel < 8; channel++)

		if (((data[0] >> channel) & 0x01) != 0)

			outb((((data[1] >> channel) & 0x01) << 3) | channel,

	unsigned int mask;

	unsigned int chan;

	unsigned int val;



	mask = comedi_dio_update_state(s, data);

	if (mask) {

		for (chan = 0; chan < 8; chan++) {

			if ((mask >> chan) & 0x01) {

				val = (s->state >> chan) & 0x01;

				outb((val << 3) | chan,

				     dev->iobase + ADQ12B_OUTBR);



	/* store information to retrieve when asked for reading */

	if (data[0]) {

		devpriv->digital_state &= ~data[0];

		devpriv->digital_state |= (data[0] & data[1]);

			}

		}

	}



	data[1] = devpriv->digital_state;

	data[1] = s->state;



	return insn->n;

}
@@ -223,7 +224,6 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) 


	devpriv->unipolar = it->options[1];

	devpriv->differential = it->options[2];

	devpriv->digital_state = 0;

	/*

	 * initialize channel and range to -1 so we make sure we

	 * always write at least once to the CTREG in the instruction