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

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

staging: comedi: drivers: tidy up insn_rw_emulate_bits() 



Tidy up this function and fix the checkpatch.pl issues:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'

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 9bc9e60e

drivers/staging/comedi/drivers.c

+16 −19
Original line number Diff line number Diff line
@@ -575,38 +575,35 @@ EXPORT_SYMBOL_GPL(comedi_handle_events); 


static int insn_rw_emulate_bits(struct comedi_device *dev,

				struct comedi_subdevice *s,

				struct comedi_insn *insn, unsigned int *data)

				struct comedi_insn *insn,

				unsigned int *data)

{

	struct comedi_insn new_insn;

	struct comedi_insn _insn;

	unsigned int chan = CR_CHAN(insn->chanspec);

	unsigned int base_chan = (chan < 32) ? 0 : chan;

	unsigned int _data[2];

	int ret;

	static const unsigned channels_per_bitfield = 32;



	unsigned chan = CR_CHAN(insn->chanspec);

	const unsigned base_bitfield_channel =

	    (chan < channels_per_bitfield) ? 0 : chan;

	unsigned int new_data[2];



	memset(new_data, 0, sizeof(new_data));

	memset(&new_insn, 0, sizeof(new_insn));

	new_insn.insn = INSN_BITS;

	new_insn.chanspec = base_bitfield_channel;

	new_insn.n = 2;

	new_insn.subdev = insn->subdev;

	memset(_data, 0, sizeof(_data));

	memset(&_insn, 0, sizeof(_insn));

	_insn.insn = INSN_BITS;

	_insn.chanspec = base_chan;

	_insn.n = 2;

	_insn.subdev = insn->subdev;



	if (insn->insn == INSN_WRITE) {

		if (!(s->subdev_flags & SDF_WRITABLE))

			return -EINVAL;

		new_data[0] = 1 << (chan - base_bitfield_channel); /* mask */

		new_data[1] = data[0] ? (1 << (chan - base_bitfield_channel))

			      : 0; /* bits */

		_data[0] = 1 << (chan - base_chan);		    /* mask */

		_data[1] = data[0] ? (1 << (chan - base_chan)) : 0; /* bits */

	}



	ret = s->insn_bits(dev, s, &new_insn, new_data);

	ret = s->insn_bits(dev, s, &_insn, _data);

	if (ret < 0)

		return ret;



	if (insn->insn == INSN_READ)

		data[0] = (new_data[1] >> (chan - base_bitfield_channel)) & 1;

		data[0] = (_data[1] >> (chan - base_chan)) & 1;



	return 1;

}