From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 11 Jul 2012 00:22:46 +0000 (-0700)
Subject: staging: comedi: rtd520: remove RtdDma1Control macro
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4de01dbbca4f11c8943e495ffda52c16778a2f0e;p=linux.git

staging: comedi: rtd520: remove RtdDma1Control 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
'writeb'. 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 65f0b11614f56..09e39389a4142 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -406,10 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Set control for DMA 1 (write only, shadow?) */
-#define RtdDma1Control(dev, n) \
-	writeb(devpriv->dma1Control = (n), devpriv->lcfg+LCFG_DMACSR1)
-
 /* Get status for DMA 1 */
 #define RtdDma1Status(dev) \
 	readb(devpriv->lcfg+LCFG_DMACSR1)
@@ -1968,9 +1964,11 @@ static void rtd_detach(struct comedi_device *dev)
 #ifdef USE_DMA
 		if (devpriv->lcfg) {
 			devpriv->dma0Control = 0;
+			devpriv->dma1Control = 0;
 			writeb(devpriv->dma0Control,
 				devpriv->lcfg + LCFG_DMACSR0);
-			RtdDma1Control(dev, 0);	/* disable DMA */
+			writeb(devpriv->dma1Control,
+				devpriv->lcfg + LCFG_DMACSR1);
 			writel(ICS_PIE | ICS_PLIE, devpriv->lcfg + LCFG_ITCSR);
 		}
 #endif /* USE_DMA */