diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-07 17:19:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-09 17:03:55 -0800 |
| commit | aba97d74034d73d2e1c63cd5da73a51d014c092e (patch) | |
| tree | e8a66775b5a4093b98dc291d9d558235d17d8395 | |
| parent | 3b78602f7dfdb187c62923213f19c7e39f300d70 (diff) | |
staging: comedi: aio_iiro_16: fix subdevice 1 'type'
Subdevice 1 is a digial input not a digital I/O subdevice.
Fix the type and, for aesthetics, rename the (*insn_bits) function used
to read the inputs.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/aio_iiro_16.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c index 87d1372f7aab..2cfbb61a2508 100644 --- a/drivers/staging/comedi/drivers/aio_iiro_16.c +++ b/drivers/staging/comedi/drivers/aio_iiro_16.c @@ -55,10 +55,10 @@ static int aio_iiro_16_do_insn_bits(struct comedi_device *dev, return insn->n; } -static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data) +static int aio_iiro_16_di_insn_bits(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { data[1] = 0; data[1] |= inb(dev->iobase + AIO_IIRO_16_INPUT_0_7); @@ -90,12 +90,12 @@ static int aio_iiro_16_attach(struct comedi_device *dev, s->insn_bits = aio_iiro_16_do_insn_bits; s = &dev->subdevices[1]; - s->type = COMEDI_SUBD_DIO; + s->type = COMEDI_SUBD_DI; s->subdev_flags = SDF_READABLE; s->n_chan = 16; s->maxdata = 1; s->range_table = &range_digital; - s->insn_bits = aio_iiro_16_dio_insn_bits_read; + s->insn_bits = aio_iiro_16_di_insn_bits; return 0; } |