Commit afbd3c2b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8aedf0f1
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* *
* 8 x Digital Outputs, 24V, 1A * 8 x Digital Outputs, 24V, 1A
* *
* 4 x 16-bit counters * 4 x 16-bit counters - not implemented
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -219,21 +219,6 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev, ...@@ -219,21 +219,6 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev,
return insn->n; 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) static int icp_multi_reset(struct comedi_device *dev)
{ {
int i; int i;
...@@ -279,7 +264,7 @@ static int icp_multi_auto_attach(struct comedi_device *dev, ...@@ -279,7 +264,7 @@ static int icp_multi_auto_attach(struct comedi_device *dev,
if (!dev->mmio) if (!dev->mmio)
return -ENOMEM; return -ENOMEM;
ret = comedi_alloc_subdevices(dev, 5); ret = comedi_alloc_subdevices(dev, 4);
if (ret) if (ret)
return ret; return ret;
...@@ -326,16 +311,6 @@ static int icp_multi_auto_attach(struct comedi_device *dev, ...@@ -326,16 +311,6 @@ static int icp_multi_auto_attach(struct comedi_device *dev,
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_bits = icp_multi_insn_bits_do; 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment