staging: comedi: rtd520: remove RtdClearCGT 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 ff30253bcd528ff249c19f358b650c8a4b59c7de..781f0812b2cc7baed5d6a5b3c088500b960c05e7 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 */
 
-/* Reset channel gain table read and write pointers */
-#define RtdClearCGT(dev) \
-       writel(0, devpriv->las0+LAS0_CGT_CLEAR)
-
 /* Reset channel gain table read and write pointers */
 #define RtdEnableCGT(dev, v) \
        writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_CGT_ENABLE)
@@ -797,7 +793,8 @@ static void rtd_load_channelgain_list(struct comedi_device *dev,
 {
        if (n_chan > 1) {       /* setup channel gain table */
                int ii;
-               RtdClearCGT(dev);
+
+               writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
                RtdEnableCGT(dev, 1);   /* enable table */
                for (ii = 0; ii < n_chan; ii++) {
                        RtdWriteCGTable(dev, rtdConvertChanGain(dev, list[ii],
@@ -2049,7 +2046,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        RtdInterruptClearMask(dev, ~0); /* and sets shadow */
        RtdInterruptClear(dev); /* clears bits set by mask */
        RtdInterruptOverrunClear(dev);
-       RtdClearCGT(dev);
+       writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
        RtdAdcClearFifo(dev);
        RtdDacClearFifo(dev, 0);
        RtdDacClearFifo(dev, 1);