staging: comedi: addi_apci_1564: define the APCI1564_DO_INT_CTRL_REG bits

Define the bits in this register. Remove the old defines in hwdrv_apci1564.c.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: 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_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index 9c19648..42a87b7 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -6,12 +6,6 @@
 #define APCI1564_DI_INT_ENABLE                         0x4
 #define APCI1564_DI_INT_DISABLE                                0xfffffffb
 
-/* Digital Output Interrupt Enable Disable. */
-#define APCI1564_DO_VCC_INT_ENABLE                     0x1
-#define APCI1564_DO_VCC_INT_DISABLE                    0xfffffffe
-#define APCI1564_DO_CC_INT_ENABLE                      0x2
-#define APCI1564_DO_CC_INT_DISABLE                     0xfffffffd
-
 static int apci1564_timer_insn_config(struct comedi_device *dev,
                                      struct comedi_subdevice *s,
                                      struct comedi_insn *insn,

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 33e58b9..873e329 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -81,6 +81,8 @@
 #define APCI1564_DI_IRQ_REG                    0x10
 #define APCI1564_DO_REG                                0x14
 #define APCI1564_DO_INT_CTRL_REG               0x18
+#define APCI1564_DO_INT_CTRL_CC_INT_ENA                BIT(1)
+#define APCI1564_DO_INT_CTRL_VCC_INT_ENA       BIT(0)
 #define APCI1564_DO_INT_STATUS_REG             0x1c
 #define APCI1564_DO_IRQ_REG                    0x20
 #define APCI1564_WDOG_REG                      0x24