summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-09-30 17:51:16 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-03 14:04:48 -0700
commit3390ed32aea828b1251ed8344b32eae28894d130 (patch)
treead9466837d4d5727a7d6fd21824c5a92ebcc2063
parentc8d348d4272b6638a9ec2dce14e182c1a3699afd (diff)
staging: comedi: ni_at_ao: tidy up the STATUS register defines
Rename the defines for the STATUS register so they have namespace associated with the driver. 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>
-rw-r--r--drivers/staging/comedi/drivers/ni_at_ao.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 1b87e8ce6346..62d4d858e041 100644
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -110,14 +110,14 @@ Configuration options:
#define ATAO_CFG1_DMARQ (1 << 5)
#define ATAO_CFG1_DMAEN (1 << 4)
#define ATAO_CFG1_CH(x) (((x) & 0xf) << 0)
-#define ATAO_STATUS 0x0a /* R 16 */
-#define FH (1 << 6)
-#define FE (1 << 5)
-#define FF (1 << 4)
-#define INT2 (1 << 3)
-#define INT1 (1 << 2)
-#define TCINT (1 << 1)
-#define PROMOUT (1 << 0)
+#define ATAO_STATUS_REG 0x0a
+#define ATAO_STATUS_FH (1 << 6)
+#define ATAO_STATUS_FE (1 << 5)
+#define ATAO_STATUS_FF (1 << 4)
+#define ATAO_STATUS_INT2 (1 << 3)
+#define ATAO_STATUS_INT1 (1 << 2)
+#define ATAO_STATUS_TCINT (1 << 1)
+#define ATAO_STATUS_PROMOUT (1 << 0)
#define ATAO_FIFO_WRITE 0x0c /* W 16 */
#define ATAO_FIFO_CLEAR 0x0c /* R 16 */
#define ATAO_DACn(x) (0x0c + ((x) * 2)) /* W */