[PATCH 9/9] staging: comedi: addi_apci_1564: move APCI1564_DO_INT_CTRL/STATUS_REG bit defines

H Hartley Sweeten hsweeten at visionengravers.com
Mon Oct 20 17:58:05 UTC 2014


Move the bit defines for the APCI1564_DO_INT_CTRL/STATUS_REG from the included
source file to the main driver source file.

For aesthetics, rename the bit defines so they have namespace associated
with the register defines. Also, remove the unnecessary 'disable' defines
and convert the 'enable' defines to bit-shifts.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c | 6 ------
 drivers/staging/comedi/drivers/addi_apci_1564.c           | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index 2ec9cf3..603cd2a 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -1,9 +1,3 @@
-/* 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
-
 /* TIMER COUNTER WATCHDOG DEFINES */
 #define ADDIDATA_TIMER					0
 #define ADDIDATA_COUNTER				1
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 5eb4940..3395d7f 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -51,6 +51,8 @@
 #define APCI1564_DO_REG				0x18
 #define APCI1564_DO_INT_CTRL_REG		0x1c
 #define APCI1564_DO_INT_STATUS_REG		0x20
+#define APCI1564_DO_INT_CTRL_STATUS_CC		(1 << 1)
+#define APCI1564_DO_INT_CTRL_STATUC_VCC		(1 << 0)
 #define APCI1564_DO_IRQ_REG			0x24
 #define APCI1564_WDOG_REG			0x28
 #define APCI1564_WDOG_RELOAD_REG		0x2c
-- 
2.0.3



More information about the devel mailing list