From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 10 Jul 2012 23:56:40 +0000 (-0700)
Subject: staging: comedi: rtd520: remove RtdPacerCounter macro
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5b8b384dfd6cf5ac1aaae644f99cc5cefc6a3004;p=deliverable%2Flinux.git

staging: comedi: rtd520: remove RtdPacerCounter 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 de4a150cdb24..7a940b755df6 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 */
 
-/* Pacer counter, 24bit */
-#define RtdPacerCounter(dev, v) \
-	writel((v) & 0xffffff, devpriv->las0+LAS0_PCLK)
-
 /* Burst counter, 10bit */
 #define RtdBurstCount(dev) \
 	readl(devpriv->las0+LAS0_BCLK)
@@ -1512,7 +1508,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 					TRIG_ROUND_NEAREST);
 		/* set PACER clock */
 		/*DPRINTK ("rtd520: loading %d into pacer\n", timer); */
-		RtdPacerCounter(dev, timer);
+		writel(timer & 0xffffff, devpriv->las0 + LAS0_PCLK);
 
 		break;