---

yaml --- r: 317889 b: refs/heads/master c: 3194c5e h: refs/heads/master i: 317887: 23f6b3d v: v3
git-mirror · Jul 13, 2012 · f4b7188 · f4b7188
1 parent 90a08e1
commit f4b7188
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfe43ed9d63ed60c223387871e7c980f851e96f6
+refs/heads/master: 3194c5e33131fd4948ad97a8934369a7b2efdd00
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 */
 
-/* Write channel gain table entry */
-#define RtdWriteCGTable(dev, v) \
-	writel(v, devpriv->las0+LAS0_CGT_WRITE)
-
 /* Write Channel Gain Latch */
 #define RtdWriteCGLatch(dev, v) \
 	writel(v, devpriv->las0+LAS0_CGL_WRITE)
@@ -793,8 +789,8 @@ static void rtd_load_channelgain_list(struct comedi_device *dev,
 		writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
 		writel(1, devpriv->las0 + LAS0_CGT_ENABLE);
 		for (ii = 0; ii < n_chan; ii++) {
-			RtdWriteCGTable(dev, rtdConvertChanGain(dev, list[ii],
-								ii));
+			writel(rtdConvertChanGain(dev, list[ii], ii),
+				devpriv->las0 + LAS0_CGT_WRITE);
 		}
 	} else {		/* just use the channel gain latch */
 		writel(0, devpriv->las0 + LAS0_CGT_ENABLE);