From 178bd8d3a61432ce24399604b13cc756293d1ac8 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 12 Jun 2013 16:08:14 -0700
Subject: [PATCH] staging: comedi: addi_apci_3xxx: boards do not have a timer
None of the boards supported by this driver have a timer. Remove
the unnecessary code.
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>
---
drivers/staging/comedi/drivers/addi_apci_3xxx.c | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 909e7b674ae6..dfd8f62351ac 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -732,7 +732,6 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
devpriv->s_EeParameters.i_NbrDiChannel = board->i_NbrDiChannel;
devpriv->s_EeParameters.i_NbrDoChannel = board->i_NbrDoChannel;
devpriv->s_EeParameters.i_DoMaxdata = board->i_DoMaxdata;
- devpriv->s_EeParameters.i_Timer = board->i_Timer;
devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =
board->ui_MinAcquisitiontimeNs;
devpriv->s_EeParameters.ui_MinDelaytimeNs = board->ui_MinDelaytimeNs;
@@ -848,21 +847,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise Timer Subdevice Structures */
s = &dev->subdevices[4];
- if (devpriv->s_EeParameters.i_Timer) {
- s->type = COMEDI_SUBD_TIMER;
- s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
- s->n_chan = 1;
- s->maxdata = 0;
- s->len_chanlist = 1;
- s->range_table = &range_digital;
-
- s->insn_write = board->timer_write;
- s->insn_read = board->timer_read;
- s->insn_config = board->timer_config;
- s->insn_bits = board->timer_bits;
- } else {
- s->type = COMEDI_SUBD_UNUSED;
- }
+ s->type = COMEDI_SUBD_UNUSED;
/* Allocate and Initialise TTL */
s = &dev->subdevices[5];
--
2.34.1