leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: dt9812: convert digital in subdevice to (*insn_bits)

Browse Source 
Currently the (*insn_read) function for the digital input subdevice
returns the state for a single channel. It's more efficent to use
the (*insn_bits) function and return the state for all the channels.

The comedi core can use the (*insn_bits) to emulate the (*insn_read)
if needed.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-05-14 14:32:17 -07:00 committed by Greg Kroah-Hartman
parent 421b42ab17
commit e81eaba6c4
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/comedi/drivers/dt9812.c
View File

@ -607,18 +607,21 @@ static int dt9812_analog_out(struct comedi_device *dev, int channel, u16 value)
return ret;
}
static int dt9812_di_rinsn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn,
unsigned int *data)
static int dt9812_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
unsigned int channel = CR_CHAN(insn->chanspec);
int n;
u8 bits = 0;
int ret;
dt9812_digital_in(dev, &bits);
for (n = 0; n < insn->n; n++)
data[n] = ((1 << channel) & bits) != 0;
return n;
ret = dt9812_digital_in(dev, &bits);
if (ret)
return ret;
data[1] = bits;
return insn->n;
}
static int dt9812_do_winsn(struct comedi_device *dev,
@ -837,7 +840,7 @@ static int dt9812_auto_attach(struct comedi_device *dev,
s->n_chan = 8;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_read = dt9812_di_rinsn;
s->insn_bits = dt9812_di_insn_bits;
/* Digital Output subdevice */
s = &dev->subdevices[1];