staging: comedi: das08: rename and rewrite DAS08_IP

The `DAS08_IP()` macro takes a value read from the status register and
returns the state of the three digital input channels (except on "JR"
boards).  Rename it to `DAS08_STATUS_DI()` and add a comment.  Also
re-arrange the expression used to extract the state of the digital
inputs for consistency with other register macros.

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>

diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index 935bbfb213e624222b9a2d988951192a80d7f6cc..eef0456fdc70c80cdea7059d5d9f51289b12415f 100644 (file)
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -65,7 +65,8 @@
  * setting the INTE control bit to 0.  Not present on "JR" boards.
  */
 #define DAS08_STATUS_IRQ       BIT(3)  /* latched interrupt input */
-#define   DAS08_IP(x)                  (((x)>>4)&0x7)
+/* digital inputs (not "JR" boards) */
+#define DAS08_STATUS_DI(x)     (((x) & 0x70) >> 4)
 #define DAS08_CONTROL          2
 #define   DAS08_MUX_MASK       0x7
 #define   DAS08_MUX(x)         ((x) & DAS08_MUX_MASK)
@@ -287,7 +288,7 @@ static int das08_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
        data[0] = 0;
-       data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS_REG));
+       data[1] = DAS08_STATUS_DI(inb(dev->iobase + DAS08_STATUS_REG));
 
        return insn->n;
 }