---

yaml --- r: 317936 b: refs/heads/master c: b0c375a h: refs/heads/master v: v3
git-mirror · Jul 15, 2012 · a884115 · a884115
1 parent d7dfe82
commit a884115
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6e3da878313562078c7fc434c3c7f646b33f202
+refs/heads/master: b0c375a31ca821da57f752d4ded1689182876d02
diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c
@@ -406,9 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-#define RtdDio0CtrlWrite(dev, v) \
-	writew((v) & 0xff, devpriv->las0+LAS0_DIO0_CTRL)
-
 /* Digital to Analog converter */
 /* Write one data value (sign + 12bit + marker bits) */
 /* Note: matches what DMA would put.  Actual value << 3 */
@@ -1686,7 +1683,7 @@ static int rtd_dio_insn_config(struct comedi_device *dev,
 	/* TODO support digital match interrupts and strobes */
 	devpriv->dioStatus = 0x01;	/* set direction */
 	writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);
-	RtdDio0CtrlWrite(dev, s->io_bits);	/* set direction 1 means Out */
+	writew(s->io_bits & 0xff, devpriv->las0 + LAS0_DIO0_CTRL);
 	devpriv->dioStatus = 0x00;	/* clear interrupts */
 	writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);