]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: das08: rename DAS08_TRIG_12BIT
authorIan Abbott <abbotti@mev.co.uk>
Fri, 5 Jun 2015 17:30:11 +0000 (18:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Jun 2015 00:06:40 +0000 (17:06 -0700)
The `DAS08_TRIG_12BIT` macro contains the offset to the write-only
software trigger register for 12-bit or 16-bit analog-to-digital
conversions.  Rename the macro to `DAS08_AI_TRIG_REG` and add a comment.

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 1d9e6a6793274dc3425104e55fcaa7f67406697a..fa14fa105b00d60a60a443a70f16f9777f4d6508 100644 (file)
@@ -56,7 +56,7 @@
  */
 #define DAS08_AI_LSB_REG       0x00    /* (R) AI least significant bits */
 #define DAS08_AI_MSB_REG       0x01    /* (R) AI most significant bits */
-#define DAS08_TRIG_12BIT       1
+#define DAS08_AI_TRIG_REG      0x01    /* (W) AI software trigger */
 #define DAS08_STATUS           2
 #define   DAS08_EOC                    (1<<7)
 #define   DAS08_IRQ                    (1<<3)
@@ -251,7 +251,7 @@ static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                                dev_info(dev->class_dev, "over-range\n");
 
                /* trigger conversion */
-               outb_p(0, dev->iobase + DAS08_TRIG_12BIT);
+               outb_p(0, dev->iobase + DAS08_AI_TRIG_REG);
 
                ret = comedi_timeout(dev, s, insn, das08_ai_eoc, 0);
                if (ret)