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

staging: comedi: cb_das16_cs: remove unused timer subdevice

The timer subdevice is never initialized due to the 'if (0)'. The
comedi callbacks also don't do anything and just return -EINVAL.

Remove the subdevice and associated code.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent adb2d69b
...@@ -425,21 +425,6 @@ static int das16cs_dio_insn_config(struct comedi_device *dev, ...@@ -425,21 +425,6 @@ static int das16cs_dio_insn_config(struct comedi_device *dev,
return insn->n; return insn->n;
} }
static int das16cs_timer_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
return -EINVAL;
}
static int das16cs_timer_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
return -EINVAL;
}
static const struct das16cs_board *das16cs_probe(struct comedi_device *dev, static const struct das16cs_board *das16cs_probe(struct comedi_device *dev,
struct pcmcia_device *link) struct pcmcia_device *link)
{ {
...@@ -497,7 +482,7 @@ static int das16cs_attach(struct comedi_device *dev, ...@@ -497,7 +482,7 @@ static int das16cs_attach(struct comedi_device *dev,
if (alloc_private(dev, sizeof(struct das16cs_private)) < 0) if (alloc_private(dev, sizeof(struct das16cs_private)) < 0)
return -ENOMEM; return -ENOMEM;
ret = comedi_alloc_subdevices(dev, 4); ret = comedi_alloc_subdevices(dev, 3);
if (ret) if (ret)
return ret; return ret;
...@@ -540,21 +525,6 @@ static int das16cs_attach(struct comedi_device *dev, ...@@ -540,21 +525,6 @@ static int das16cs_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} }
s = dev->subdevices + 3;
/* timer subdevice */
if (0) {
s->type = COMEDI_SUBD_TIMER;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 1;
s->maxdata = 0xff;
s->range_table = &range_unknown;
s->insn_read = das16cs_timer_insn_read;
s->insn_config = das16cs_timer_insn_config;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
return 1; return 1;
} }
......
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