staging: comedi: addi-data: remove duplicate ADDIDATA_{ENABLE,DISABLE} defines

These are defined in addi_common.h, the hwdrv_* files do not need
to redefined them.

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>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
index 799bc0417babd29cec150ced83751a8ccc4e72bc..3d66e48e0cf7b4417f0381877e280cff538daf24 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
@@ -96,10 +96,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define ADDIDATA_UNIPOLAR              1
 #define ADDIDATA_BIPOLAR               2
 
-/* ADDIDATA Enable Disable */
-#define ADDIDATA_ENABLE                        1
-#define ADDIDATA_DISABLE               0
-
 /* ANALOG INPUT RANGE */
 static struct comedi_lrange range_apci035_ai = {
        8, {

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
index 7b19b09a572c609ee236e08547d625a4c3e10171..30a44aea0c2f0d472f9a6890d37548b464ab4c55 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
@@ -67,10 +67,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define APCI1032_DIGITAL_IP_INTERRUPT_ENABLE   0x4
 #define APCI1032_DIGITAL_IP_INTERRUPT_DISABLE  0xfffffffb
 
-/* ADDIDATA Enable Disable */
-#define ADDIDATA_ENABLE                                1
-#define ADDIDATA_DISABLE                       0
-
 static unsigned int ui_InterruptStatus;
 
 /*

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index ef5e778748bb70aee17b6e629716468b380363fc..0f734d5be4cbe8c15a8e3b836f796756ec4d3fa6 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -83,11 +83,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define APCI1564_DIGITAL_OP_CC_INTERRUPT_ENABLE                0x2
 #define APCI1564_DIGITAL_OP_CC_INTERRUPT_DISABLE       0xfffffffd
 
-/* ADDIDATA Enable Disable */
-
-#define ADDIDATA_ENABLE                                        1
-#define ADDIDATA_DISABLE                               0
-
 /* TIMER COUNTER WATCHDOG DEFINES */
 
 #define ADDIDATA_TIMER                                 0

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
index b71b7bb944b40ee43f97ff9a3ecd72499fb5706c..5958a9cb2a38325435c6e0beea97300a085695d8 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
@@ -51,11 +51,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define COMEDI_SUBD_TTLIO              11 /* Digital Input Output But TTL */
 #endif
 
-#ifndef ADDIDATA_ENABLE
-#define ADDIDATA_ENABLE                        1
-#define ADDIDATA_DISABLE               0
-#endif
-
 #define APCI16XX_TTL_INIT              0
 #define APCI16XX_TTL_INITDIRECTION     1
 #define APCI16XX_TTL_OUTPUTMEMORY      2

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
index 5342832b8094541b01de90edb56de27f0d786cab..b7192875b0098e886ab75b8b5aa90bd8b914996e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
@@ -55,11 +55,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define APCI2016_DIGITAL_OP            0x04
 #define APCI2016_DIGITAL_OP_RW         4
 
-/* ADDIDATA Enable Disable */
-
-#define ADDIDATA_ENABLE                        1
-#define ADDIDATA_DISABLE               0
-
 /* TIMER COUNTER WATCHDOG DEFINES */
 
 #define ADDIDATA_WATCHDOG              2

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
index 557df247b7f5d58aa7196719e5324e3378edd4cb..ebe6d1d4fe64de723e897a02a322c7f656d492cd 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
@@ -67,11 +67,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define APCI2032_DIGITAL_OP_CC_INTERRUPT_ENABLE                0x2
 #define APCI2032_DIGITAL_OP_CC_INTERRUPT_DISABLE       0xfffffffd
 
-/* ADDIDATA Enable Disable */
-
-#define ADDIDATA_ENABLE                                        1
-#define ADDIDATA_DISABLE                               0
-
 /* TIMER COUNTER WATCHDOG DEFINES */
 
 #define ADDIDATA_WATCHDOG                              2

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
index 23984bfcce3991c923071efeae5888adecacfe6b..d1b0ee6b628f4b9c365162f33feae55569fd61ed 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -48,11 +48,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define COMEDI_SUBD_TTLIO      11      /* Digital Input Output But TTL */
 #endif
 
-#ifndef ADDIDATA_ENABLE
-#define ADDIDATA_ENABLE                                1
-#define ADDIDATA_DISABLE                       0
-#endif
-
 #define APCI3XXX_SINGLE                                0
 #define APCI3XXX_DIFF                          1
 #define APCI3XXX_CONFIGURATION                 0