lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten
2012-10-31 16:59:15 -07:00
committed by Greg Kroah-Hartman
parent 91952b7806
commit e53b9d6d8b
7 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
View File

@@ -96,10 +96,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
#define ADDIDATA_UNIPOLAR 1 #define ADDIDATA_UNIPOLAR 1
#define ADDIDATA_BIPOLAR 2 #define ADDIDATA_BIPOLAR 2
/* ADDIDATA Enable Disable */
#define ADDIDATA_ENABLE 1
#define ADDIDATA_DISABLE 0
/* ANALOG INPUT RANGE */ /* ANALOG INPUT RANGE */
static struct comedi_lrange range_apci035_ai = { static struct comedi_lrange range_apci035_ai = {
8, { 8, {

4
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
View File

@@ -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_ENABLE 0x4
#define APCI1032_DIGITAL_IP_INTERRUPT_DISABLE 0xfffffffb #define APCI1032_DIGITAL_IP_INTERRUPT_DISABLE 0xfffffffb
/* ADDIDATA Enable Disable */
#define ADDIDATA_ENABLE 1
#define ADDIDATA_DISABLE 0
static unsigned int ui_InterruptStatus; static unsigned int ui_InterruptStatus;
/* /*

5
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
View File

@@ -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_ENABLE 0x2
#define APCI1564_DIGITAL_OP_CC_INTERRUPT_DISABLE 0xfffffffd #define APCI1564_DIGITAL_OP_CC_INTERRUPT_DISABLE 0xfffffffd
/* ADDIDATA Enable Disable */
#define ADDIDATA_ENABLE 1
#define ADDIDATA_DISABLE 0
/* TIMER COUNTER WATCHDOG DEFINES */ /* TIMER COUNTER WATCHDOG DEFINES */
#define ADDIDATA_TIMER 0 #define ADDIDATA_TIMER 0

5
drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
View File

@@ -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 */ #define COMEDI_SUBD_TTLIO 11 /* Digital Input Output But TTL */
#endif #endif
#ifndef ADDIDATA_ENABLE
#define ADDIDATA_ENABLE 1
#define ADDIDATA_DISABLE 0
#endif
#define APCI16XX_TTL_INIT 0 #define APCI16XX_TTL_INIT 0
#define APCI16XX_TTL_INITDIRECTION 1 #define APCI16XX_TTL_INITDIRECTION 1
#define APCI16XX_TTL_OUTPUTMEMORY 2 #define APCI16XX_TTL_OUTPUTMEMORY 2

5
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
View File

@@ -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 0x04
#define APCI2016_DIGITAL_OP_RW 4 #define APCI2016_DIGITAL_OP_RW 4
/* ADDIDATA Enable Disable */
#define ADDIDATA_ENABLE 1
#define ADDIDATA_DISABLE 0
/* TIMER COUNTER WATCHDOG DEFINES */ /* TIMER COUNTER WATCHDOG DEFINES */
#define ADDIDATA_WATCHDOG 2 #define ADDIDATA_WATCHDOG 2

5
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
View File

@@ -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_ENABLE 0x2
#define APCI2032_DIGITAL_OP_CC_INTERRUPT_DISABLE 0xfffffffd #define APCI2032_DIGITAL_OP_CC_INTERRUPT_DISABLE 0xfffffffd
/* ADDIDATA Enable Disable */
#define ADDIDATA_ENABLE 1
#define ADDIDATA_DISABLE 0
/* TIMER COUNTER WATCHDOG DEFINES */ /* TIMER COUNTER WATCHDOG DEFINES */
#define ADDIDATA_WATCHDOG 2 #define ADDIDATA_WATCHDOG 2

5
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
View File

@@ -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 */ #define COMEDI_SUBD_TTLIO 11 /* Digital Input Output But TTL */
#endif #endif
#ifndef ADDIDATA_ENABLE
#define ADDIDATA_ENABLE 1
#define ADDIDATA_DISABLE 0
#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