]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: das08: rename and rewrite DAS08_INTE
authorIan Abbott <abbotti@mev.co.uk>
Fri, 5 Jun 2015 17:30:18 +0000 (18:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Jun 2015 00:06:40 +0000 (17:06 -0700)
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>
drivers/staging/comedi/drivers/das08.c

index f0ee617028db9da64d70057e61ce0ff720cde668..9898ac0f13352081395a46325b95edd63aa59339 100644 (file)
@@ -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)