staging: comedi: rtd520: remove RtdResetBoard macro
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 10 Jul 2012 23:39:25 +0000 (16:39 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Jul 2012 15:12:21 +0000 (08:12 -0700)
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>
drivers/staging/comedi/drivers/rtd520.c

index cc1371daacd2efc11e7a3477a192680fa89dd56b..0b6da102f9763486a392f9003aa0d6185e0f587a 100644 (file)
@@ -406,10 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Reset board */
-#define RtdResetBoard(dev) \
-       writel(0, devpriv->las0+LAS0_BOARD_RESET)
-
 /* Reset channel gain table read pointer */
 #define RtdResetCGT(dev) \
        writel(0, devpriv->las0+LAS0_CGT_RESET)
@@ -2050,7 +2046,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
        /* initialize board, per RTD spec */
        /* also, initialize shadow registers */
-       RtdResetBoard(dev);
+       writel(0, devpriv->las0 + LAS0_BOARD_RESET);
        udelay(100);            /* needed? */
        RtdPlxInterruptWrite(dev, 0);
        RtdInterruptMask(dev, 0);       /* and sets shadow */
@@ -2231,7 +2227,7 @@ static void rtd_detach(struct comedi_device *dev)
                }
 #endif /* USE_DMA */
                if (devpriv->las0) {
-                       RtdResetBoard(dev);
+                       writel(0, devpriv->las0 + LAS0_BOARD_RESET);
                        RtdInterruptMask(dev, 0);
                        RtdInterruptClearMask(dev, ~0);
                        RtdInterruptClear(dev); /* clears bits set by mask */