From 6a3a22bcada2209520180c8bf0045e4e241003af Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 5 Jun 2015 18:30:18 +0100 Subject: [PATCH] staging: comedi: das08: rename and rewrite DAS08_INTE The `DAS08_INTE` macro contains a mask for the "INTE" bit in the control register (except on "JR" boards). Setting it to 1 enables interrupts. Setting it to 0 disables interrupts and clears the "IRQ" bit in the status register. Rename the macro to `DAS08_CONTROL_INTE` and add a comment. Also use the `BIT()` macro to define its value. (Note: the driver does not currently enable interrupts.) Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/das08.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index f0ee617..9898ac0 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -74,7 +74,7 @@ */ #define DAS08_CONTROL_MUX_MASK 0x7 /* multiplexor channel mask */ #define DAS08_CONTROL_MUX(x) ((x) & DAS08_CONTROL_MUX_MASK) /* mux channel */ -#define DAS08_INTE (1<<3) +#define DAS08_CONTROL_INTE BIT(3) /* interrupt enable (not "JR" boards) */ #define DAS08_DO_MASK 0xf0 #define DAS08_OP(x) (((x) << 4) & DAS08_DO_MASK) -- 2.7.4