summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-07-10 16:42:48 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-13 08:12:22 -0700
commit9b3f95cc39ed9ab637fee93ca86d42ca83d74099 (patch)
treec44a9a3ca8269b07177419c1e0e38f1630e9807d
parent3194c5e33131fd4948ad97a8934369a7b2efdd00 (diff)
staging: comedi: rtd520: remove RtdWriteCGLatch 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>
-rw-r--r--drivers/staging/comedi/drivers/rtd520.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 0467877a4536..3a7c030f8a93 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -406,10 +406,6 @@ struct rtdPrivate {
/* Macros to access registers */
-/* Write Channel Gain Latch */
-#define RtdWriteCGLatch(dev, v) \
- writel(v, devpriv->las0+LAS0_CGL_WRITE)
-
/* Reset ADC FIFO */
#define RtdAdcClearFifo(dev) \
writel(0, devpriv->las0+LAS0_ADC_FIFO_CLEAR)
@@ -794,7 +790,8 @@ static void rtd_load_channelgain_list(struct comedi_device *dev,
}
} else { /* just use the channel gain latch */
writel(0, devpriv->las0 + LAS0_CGT_ENABLE);
- RtdWriteCGLatch(dev, rtdConvertChanGain(dev, list[0], 0));
+ writel(rtdConvertChanGain(dev, list[0], 0),
+ devpriv->las0 + LAS0_CGL_WRITE);
}
}