Skip to content

Commit

Permalink
staging: comedi: addi-data: remove duplicate ADDIDATA_{ENABLE,DISABLE…
Browse files Browse the repository at this point in the history
…} 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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent 91952b7 commit e53b9d6
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 33 deletions.
4 changes: 0 additions & 4 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e53b9d6

Please sign in to comment.