staging: comedi: addi-data: remove unused 'i_NbrTTLChannel' boardinfo

None of the addi-data drivers that still use the "common" code have
ttl digital i/o. Remove the unnecessary boardinfo as well as the
subdevice initialization 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>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 2a741ff4196b09dd34f77cdd369e76edac7baf22..f25e0085219d33b8e2764a771bd0cedd69f6cd9f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -39,10 +39,6 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details.
   +-----------------------------------------------------------------------+
 */
 
-#ifndef COMEDI_SUBD_TTLIO
-#define COMEDI_SUBD_TTLIO   11 /* Digital Input Output But TTL */
-#endif
-
 static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,
                                     struct comedi_subdevice *s,
                                     struct comedi_insn *insn,
@@ -259,18 +255,7 @@ static int addi_auto_attach(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;
-       } else {
-               s->type = COMEDI_SUBD_UNUSED;
-       }
+       s->type = COMEDI_SUBD_UNUSED;
 
        /* EEPROM */
        s = &dev->subdevices[6];

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 443b37e895b955eb8f87f0b0cb49b0bbeb2589c4..f1be5ade9962efee53dd47613ec469b143b054b7 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -54,8 +54,6 @@ struct addi_board {
        int i_NbrDoChannel;     /*  Number of DO channels */
        int i_DoMaxdata;        /*  data to set all channels high */
 
-       int i_NbrTTLChannel;    /*  Number of TTL channels */
-
        int i_Timer;            /*    timer subdevice present or not */
        unsigned int ui_MinAcquisitiontimeNs;   /*  Minimum Acquisition in Nano secs */
        unsigned int ui_MinDelaytimeNs; /*  Minimum Delay in Nano secs */