From 9b3f95cc39ed9ab637fee93ca86d42ca83d74099 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 10 Jul 2012 16:42:48 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/rtd520.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 0467877..3a7c030 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); } } -- 2.7.4