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 65f0b11614f56b2fad826343fa81cd4783ff62df..09e39389a4142c6a57115ee80670d65dd8c9671d 100644 (file)
--- 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 */