summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2015-06-05 18:30:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-12 17:06:40 -0700
commit6a3a22bcada2209520180c8bf0045e4e241003af (patch)
tree3e5668b9ba09561f2a8e3bc1a78567159a7f9b3b
parentac81df6097bb30c61bc8e7e3ce8100adcee14b66 (diff)
downloadlinux-stable-6a3a22bcada2209520180c8bf0045e4e241003af.tar.gz
linux-stable-6a3a22bcada2209520180c8bf0045e4e241003af.tar.bz2
linux-stable-6a3a22bcada2209520180c8bf0045e4e241003af.zip
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 <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/das08.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index f0ee617028db..9898ac0f1335 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)