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

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

staging: comedi: quatech_daqp_cs: use (*insn_bits) for digital inputs 



Change the subdevice operation used to read the digital inputs from
a (*insn_read) to a (*insn_bits) function. The (*insn_read) functions
are expected to read 'insn->n' number of samples. The (*insn_bits)
functions just read a single sample (insn->n = 1). Change the return
from '1' to 'insn->n' to clarify what the return is.

Also, set the 'maxdata' for the subdevice. For digital io this value
should be '1' (digital io can only be 1 or 0).

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 491cc0b0

drivers/staging/comedi/drivers/quatech_daqp_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -671,11 +671,10 @@ static int daqp_ao_insn_write(struct comedi_device *dev, 
	return 1;

}



/* Digital input routine */



static int daqp_di_insn_read(struct comedi_device *dev,

static int daqp_di_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 daqp_private *devpriv = dev->private;
@@ -684,7 +683,7 @@ static int daqp_di_insn_read(struct comedi_device *dev, 


	data[0] = inb(dev->iobase + DAQP_DIGITAL_IO);



	return 1;

	return insn->n;

}



/* Digital output routine */
@@ -758,7 +757,8 @@ static int daqp_auto_attach(struct comedi_device *dev, 
	s->type		= COMEDI_SUBD_DI;

	s->subdev_flags	= SDF_READABLE;

	s->n_chan	= 1;

	s->insn_read	= daqp_di_insn_read;

	s->maxdata	= 1;

	s->insn_bits	= daqp_di_insn_bits;



	s = &dev->subdevices[3];

	s->type		= COMEDI_SUBD_DO;