diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-10-07 14:52:46 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 22:56:42 -0700 |
| commit | afbd3c2b97499d74d068908ecd10cbef0d0c6e16 (patch) | |
| tree | ecbab640f4636f07423e3e957c24b7362039cca8 | |
| parent | staging: comedi: icp_multi: fix clock comment CodingStyle (diff) | |
| download | linux-dev-afbd3c2b97499d74d068908ecd10cbef0d0c6e16.tar.xz linux-dev-afbd3c2b97499d74d068908ecd10cbef0d0c6e16.zip | |
staging: comedi: icp_multi: remove counter subdevice
The support functions for this subdevice are not complete. Since the
counter is the last subdevice just remove it and it's allocation.
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/icp_multi.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 3d0a3c40b640..c469a70cfd3f 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -40,7 +40,7 @@ * * 8 x Digital Outputs, 24V, 1A * - * 4 x 16-bit counters + * 4 x 16-bit counters - not implemented */ #include <linux/module.h> @@ -219,21 +219,6 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev, return insn->n; } -static int icp_multi_insn_read_ctr(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) -{ - return 0; -} - -static int icp_multi_insn_write_ctr(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data) -{ - return 0; -} - static int icp_multi_reset(struct comedi_device *dev) { int i; @@ -279,7 +264,7 @@ static int icp_multi_auto_attach(struct comedi_device *dev, if (!dev->mmio) return -ENOMEM; - ret = comedi_alloc_subdevices(dev, 5); + ret = comedi_alloc_subdevices(dev, 4); if (ret) return ret; @@ -326,16 +311,6 @@ static int icp_multi_auto_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = icp_multi_insn_bits_do; - s = &dev->subdevices[4]; - s->type = COMEDI_SUBD_COUNTER; - s->subdev_flags = SDF_WRITABLE; - s->n_chan = 4; - s->maxdata = 0xffff; - s->len_chanlist = 4; - s->state = 0; - s->insn_read = icp_multi_insn_read_ctr; - s->insn_write = icp_multi_insn_write_ctr; - return 0; } |