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 799bc04..3d66e48 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 7b19b09..30a44ae 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 ef5e778..0f734d5 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 b71b7bb..5958a9c 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 5342832..b719287 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 557df24..ebe6d1d 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 23984bf..d1b0ee6 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