---

yaml --- r: 317938 b: refs/heads/master c: 58f1fde h: refs/heads/master v: v3
git-mirror · Jul 15, 2012 · e38ee77 · e38ee77
1 parent 3f249c9
commit e38ee77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f73c718554a70d27ddcd1f0a62b9731cc35eebd
+refs/heads/master: 58f1fde22e3d1faffcc8d0e5b5fa62bd9d9ee5d4
diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c
@@ -406,10 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Start single DAC conversion */
-#define RtdDacUpdate(dev, n) \
-	writew(0, devpriv->las0 + (((n) == 0) ? LAS0_DAC1 : LAS0_DAC2))
-
 /* Start single DAC conversion on both DACs */
 #define RtdDacBothUpdate(dev) \
 	writew(0, devpriv->las0+LAS0_DAC)
@@ -1572,7 +1568,7 @@ static int rtd_ao_winsn(struct comedi_device *dev,
 		/* a typical programming sequence */
 		writew(val, devpriv->las1 +
 			((chan == 0) ? LAS1_DAC1_FIFO : LAS1_DAC2_FIFO));
-		RtdDacUpdate(dev, chan);	/* trigger the conversion */
+		writew(0, devpriv->las0 + ((chan == 0) ? LAS0_DAC1 : LAS0_DAC2));
 
 		devpriv->aoValue[chan] = data[i];	/* save for read back */