Skip to content

Commit

Permalink
staging: comedi: cb_das16_cs: remove unused timer subdevice
Browse files Browse the repository at this point in the history
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent adb2d69 commit 5c416ef
Showing 1 changed file with 1 addition and 31 deletions.
32 changes: 1 addition & 31 deletions drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -425,21 +425,6 @@ static int das16cs_dio_insn_config(struct comedi_device *dev,
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,
struct pcmcia_device *link)
{
Expand Down Expand Up @@ -497,7 +482,7 @@ static int das16cs_attach(struct comedi_device *dev,
if (alloc_private(dev, sizeof(struct das16cs_private)) < 0)
return -ENOMEM;

ret = comedi_alloc_subdevices(dev, 4);
ret = comedi_alloc_subdevices(dev, 3);
if (ret)
return ret;

Expand Down Expand Up @@ -540,21 +525,6 @@ static int das16cs_attach(struct comedi_device *dev,
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;
}

Expand Down

0 comments on commit 5c416ef

Please sign in to comment.