staging: comedi: addi_apci_1032: board does not have ttl i/o
authorH Hartley Sweeten <hartleys@visionengravers.com>
Mon, 5 Nov 2012 21:34:57 +0000 (14:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 Nov 2012 08:30:54 +0000 (09:30 +0100)
This board 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>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi_apci_1032.c

index bc153c300efdaee8863a3a97a9e5982d84810df3..d44ab6fd7fe0d2ee60e81f81ac6ced13656aebd2 100644 (file)
@@ -7,10 +7,6 @@
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci1032.c"
 
-#ifndef COMEDI_SUBD_TTLIO
-#define COMEDI_SUBD_TTLIO   11 /* Digital Input Output But TTL */
-#endif
-
 static const struct addi_board apci1032_boardtypes[] = {
        {
                .pc_DriverName          = "apci1032",
@@ -270,22 +266,7 @@ static int apci1032_attach_pci(struct comedi_device *dev,
 
        /*  Allocate and Initialise TTL */
        s = &dev->subdevices[5];
-       if (this_board->i_NbrTTLChannel) {
-               s->type = COMEDI_SUBD_TTLIO;
-               s->subdev_flags =
-                       SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
-               s->n_chan = this_board->i_NbrTTLChannel;
-               s->maxdata = 1;
-               s->io_bits = 0; /* all bits input */
-               s->len_chanlist = this_board->i_NbrTTLChannel;
-               s->range_table = &range_digital;
-               s->insn_config = this_board->ttl_config;
-               s->insn_bits = this_board->ttl_bits;
-               s->insn_read = this_board->ttl_read;
-               s->insn_write = this_board->ttl_write;
-       } else {
-               s->type = COMEDI_SUBD_UNUSED;
-       }
+       s->type = COMEDI_SUBD_UNUSED;
 
        /* EEPROM */
        s = &dev->subdevices[6];