diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-11-29 20:14:31 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-29 21:05:28 -0500 |
commit | 84987a16cae8986b54efa51a6a86533ebb511a68 (patch) | |
tree | 120de11e0a902cd8c70e5371ff4c60c96e11a806 | |
parent | 25adf2ccf68814fade52f70ed2888b65db1e5156 (diff) |
staging: comedi: addi_apci_2032: board does not have ttl i/o
The board supported by this driver does not have ttl i/o. Remove the
subdevice init for it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_2032.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c index d467ecf399e7..451c390aab11 100644 --- a/drivers/staging/comedi/drivers/addi_apci_2032.c +++ b/drivers/staging/comedi/drivers/addi_apci_2032.c | |||
@@ -4,10 +4,6 @@ | |||
4 | 4 | ||
5 | #include "addi-data/addi_common.h" | 5 | #include "addi-data/addi_common.h" |
6 | 6 | ||
7 | #ifndef COMEDI_SUBD_TTLIO | ||
8 | #define COMEDI_SUBD_TTLIO 11 /* Digital Input Output But TTL */ | ||
9 | #endif | ||
10 | |||
11 | #include "addi-data/addi_eeprom.c" | 7 | #include "addi-data/addi_eeprom.c" |
12 | #include "addi-data/hwdrv_apci2032.c" | 8 | #include "addi-data/hwdrv_apci2032.c" |
13 | 9 | ||
@@ -287,22 +283,7 @@ static int apci2032_auto_attach(struct comedi_device *dev, | |||
287 | 283 | ||
288 | /* Allocate and Initialise TTL */ | 284 | /* Allocate and Initialise TTL */ |
289 | s = &dev->subdevices[5]; | 285 | s = &dev->subdevices[5]; |
290 | if (this_board->i_NbrTTLChannel) { | 286 | s->type = COMEDI_SUBD_UNUSED; |
291 | s->type = COMEDI_SUBD_TTLIO; | ||
292 | s->subdev_flags = | ||
293 | SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON; | ||
294 | s->n_chan = this_board->i_NbrTTLChannel; | ||
295 | s->maxdata = 1; | ||
296 | s->io_bits = 0; /* all bits input */ | ||
297 | s->len_chanlist = this_board->i_NbrTTLChannel; | ||
298 | s->range_table = &range_digital; | ||
299 | s->insn_config = this_board->ttl_config; | ||
300 | s->insn_bits = this_board->ttl_bits; | ||
301 | s->insn_read = this_board->ttl_read; | ||
302 | s->insn_write = this_board->ttl_write; | ||
303 | } else { | ||
304 | s->type = COMEDI_SUBD_UNUSED; | ||
305 | } | ||
306 | 287 | ||
307 | /* EEPROM */ | 288 | /* EEPROM */ |
308 | s = &dev->subdevices[6]; | 289 | s = &dev->subdevices[6]; |