staging: comedi: rtd520: remove RtdWriteCGTable macro
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 10 Jul 2012 23:42:08 +0000 (16:42 -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 550ebbd4e859347af024f664f109642bd6c8c492..0467877a4536646a8e942dfdc837830d0d5e5536 100644 (file)
@@ -406,10 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Write channel gain table entry */
-#define RtdWriteCGTable(dev, v) \
-       writel(v, devpriv->las0+LAS0_CGT_WRITE)
-
 /* Write Channel Gain Latch */
 #define RtdWriteCGLatch(dev, v) \
        writel(v, devpriv->las0+LAS0_CGL_WRITE)
@@ -793,8 +789,8 @@ static void rtd_load_channelgain_list(struct comedi_device *dev,
                writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
                writel(1, devpriv->las0 + LAS0_CGT_ENABLE);
                for (ii = 0; ii < n_chan; ii++) {
-                       RtdWriteCGTable(dev, rtdConvertChanGain(dev, list[ii],
-                                                               ii));
+                       writel(rtdConvertChanGain(dev, list[ii], ii),
+                               devpriv->las0 + LAS0_CGT_WRITE);
                }
        } else {                /* just use the channel gain latch */
                writel(0, devpriv->las0 + LAS0_CGT_ENABLE);