Commit 641abdac authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1867add9
...@@ -40,10 +40,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY ...@@ -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_SINGLE 0
#define APCI3XXX_DIFF 1 #define APCI3XXX_DIFF 1
#define APCI3XXX_CONFIGURATION 0 #define APCI3XXX_CONFIGURATION 0
......
...@@ -6,10 +6,6 @@ ...@@ -6,10 +6,6 @@
#include "comedi_fc.h" #include "comedi_fc.h"
#include "amcc_s5933.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 = { static const struct comedi_lrange apci3xxx_ai_range = {
8, { 8, {
BIP_RANGE(10), BIP_RANGE(10),
...@@ -618,7 +614,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, ...@@ -618,7 +614,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise TTL */ /* Allocate and Initialise TTL */
s = &dev->subdevices[5]; s = &dev->subdevices[5];
if (board->i_NbrTTLChannel) { if (board->i_NbrTTLChannel) {
s->type = COMEDI_SUBD_TTLIO; s->type = COMEDI_SUBD_DIO;
s->subdev_flags = s->subdev_flags =
SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON; SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = board->i_NbrTTLChannel; s->n_chan = board->i_NbrTTLChannel;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment