]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: rtd520: remove RtdEnableCGT macro
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 10 Jul 2012 23:41:29 +0000 (16:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Jul 2012 15:12:22 +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 781f0812b2cc7baed5d6a5b3c088500b960c05e7..550ebbd4e859347af024f664f109642bd6c8c492 100644 (file)
@@ -406,10 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Reset channel gain table read and write pointers */
-#define RtdEnableCGT(dev, v) \
-       writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_CGT_ENABLE)
-
 /* Write channel gain table entry */
 #define RtdWriteCGTable(dev, v) \
        writel(v, devpriv->las0+LAS0_CGT_WRITE)
@@ -795,13 +791,13 @@ static void rtd_load_channelgain_list(struct comedi_device *dev,
                int ii;
 
                writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
-               RtdEnableCGT(dev, 1);   /* enable table */
+               writel(1, devpriv->las0 + LAS0_CGT_ENABLE);
                for (ii = 0; ii < n_chan; ii++) {
                        RtdWriteCGTable(dev, rtdConvertChanGain(dev, list[ii],
                                                                ii));
                }
        } else {                /* just use the channel gain latch */
-               RtdEnableCGT(dev, 0);   /* disable table, enable latch */
+               writel(0, devpriv->las0 + LAS0_CGT_ENABLE);
                RtdWriteCGLatch(dev, rtdConvertChanGain(dev, list[0], 0));
        }
 }