From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 11 Jul 2012 00:11:01 +0000 (-0700)
Subject: staging: comedi: rtd520: remove RtdDacClearFifo macro
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e96eaf898d009aa3f40e615cc4894dfef5d1af9d;p=deliverable%2Flinux.git

staging: comedi: rtd520: remove RtdDacClearFifo macro

This macro uses the 'devpriv' macro which relies on a local variable
having a specific name. Plus it's just a wrapper around a simple
'writel'. Remove the macro.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 8cd056cbaadf..ead842033351 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -406,11 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Reset DAC FIFO */
-#define RtdDacClearFifo(dev, n) \
-	writel(0, devpriv->las0+(((n) == 0) ? LAS0_DAC1_RESET : \
-				LAS0_DAC2_RESET))
-
 /* Set source for DMA 0 (write only, shadow?) */
 #define RtdDma0Source(dev, n) \
 	writel((n) & 0xf, devpriv->las0+LAS0_DMA0_SRC)
@@ -1866,8 +1861,8 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	writel(0, devpriv->las0 + LAS0_OVERRUN);
 	writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
 	writel(0, devpriv->las0 + LAS0_ADC_FIFO_CLEAR);
-	RtdDacClearFifo(dev, 0);
-	RtdDacClearFifo(dev, 1);
+	writel(0, devpriv->las0 + LAS0_DAC1_RESET);
+	writel(0, devpriv->las0 + LAS0_DAC2_RESET);
 	/* clear digital IO fifo */
 	devpriv->dioStatus = 0;
 	writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);