staging: comedi: addi_apci_3xxx: remove COMEDI_SUBD_TTLIO

This driver abuses the enum comedi_subdevice_type by redefining
enum 11 - COMEDI_SUBD_SERIAL as COMEDI_SUBD_TTLIO. The subdevice
that uses COMEDI_SUBD_TTLIO is a TTL Digital Input/Output subdevice.

Remove COMEDI_SUBD_TTLIO and just use COMEDI_SUBD_DIO as the
subdevice type.

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/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
index 8ce552e81f33d2246cfad54f8456c9853d1effc3..372b45b2a1096e3e41173c24477b507204c8e072 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -40,10 +40,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
   +----------+-----------+------------------------------------------------+
 */
 
-#ifndef COMEDI_SUBD_TTLIO
-#define COMEDI_SUBD_TTLIO      11      /* Digital Input Output But TTL */
-#endif
-
 #define APCI3XXX_SINGLE                                0
 #define APCI3XXX_DIFF                          1
 #define APCI3XXX_CONFIGURATION                 0

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 138091924c8ba70f76780e399a40ab6a87d56920..3cdfa103f0d192892340158a2802ae00042b8ef0 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -6,10 +6,6 @@
 #include "comedi_fc.h"
 #include "amcc_s5933.h"
 
-#ifndef COMEDI_SUBD_TTLIO
-#define COMEDI_SUBD_TTLIO   11 /* Digital Input Output But TTL */
-#endif
-
 static const struct comedi_lrange apci3xxx_ai_range = {
        8, {
                BIP_RANGE(10),
@@ -618,7 +614,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
        /*  Allocate and Initialise TTL */
        s = &dev->subdevices[5];
        if (board->i_NbrTTLChannel) {
-               s->type = COMEDI_SUBD_TTLIO;
+               s->type = COMEDI_SUBD_DIO;
                s->subdev_flags =
                        SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
                s->n_chan = board->i_NbrTTLChannel;