diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-12 15:16:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-12 15:16:24 -0700 |
| commit | 99ac7cccb50fcbacdc21620a898e6d64b58a2282 (patch) | |
| tree | 7c1b46ef02e55e60c77b06f7ecc975aca998764d /drivers/staging/comedi | |
| parent | staging: comedi: drivers: use comedi_dio_insn_config() for complex cases (diff) | |
| download | linux-dev-99ac7cccb50fcbacdc21620a898e6d64b58a2282.tar.xz linux-dev-99ac7cccb50fcbacdc21620a898e6d64b58a2282.zip | |
Revert "staging: comedi: core: introduce comedi_dio_insn_config()"
This reverts commit 4f76463d3b8f8cc0cac5bb292ec766848f3f4fa1.
I applied an incorrect version here as well :(
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 40 |
2 files changed, 0 insertions, 44 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index f2f75b9dfb86..98058b9097e6 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -342,10 +342,6 @@ void comedi_buf_memcpy_from(struct comedi_async *async, unsigned int offset, /* drivers.c - general comedi driver functions */ -int comedi_dio_insn_config(struct comedi_device *, struct comedi_subdevice *, - struct comedi_insn *, unsigned int *data, - unsigned int mask); - void *comedi_alloc_devpriv(struct comedi_device *, size_t); int comedi_alloc_subdevices(struct comedi_device *, int); diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 60fd81c71a12..791a26bd5f63 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -150,46 +150,6 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, return -EINVAL; } -/** - * comedi_dio_insn_config() - boilerplate (*insn_config) for DIO subdevices. - * @dev: comedi_device struct - * @s: comedi_subdevice struct - * @insn: comedi_insn struct - * @data: parameters for the @insn - * @mask: io_bits mask for grouped channels - */ -int comedi_dio_insn_config(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data, - unsigned int mask) -{ - unsigned int chan_mask = 1 << CR_CHAN(insn->chanspec); - - if (!mask) - mask = chan_mask; - - switch (data[0]) { - case INSN_CONFIG_DIO_INPUT: - s->io_bits &= ~mask; - break; - - case INSN_CONFIG_DIO_OUTPUT: - s->io_bits |= mask; - break; - - case INSN_CONFIG_DIO_QUERY: - data[1] = (s->io_bits & mask) ? COMEDI_OUTPUT : COMEDI_INPUT; - return insn->n; - - default: - return -EINVAL; - } - - return 0; -} -EXPORT_SYMBOL_GPL(comedi_dio_insn_config); - static int insn_rw_emulate_bits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |