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

staging: comedi: rtd520: remove RtdBurstCounter 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 5f9877a3ebf5..0e3196f30734 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 */
 
-/* Burst counter, 10bit */
-#define RtdBurstCounter(dev, v) \
-	writel((v) & 0x3ff, devpriv->las0+LAS0_BCLK)
-
 /* Delay counter, 16bit */
 #define RtdDelayCount(dev) \
 	readl(devpriv->las0+LAS0_DCLK)
@@ -1527,7 +1523,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 						TRIG_ROUND_NEAREST);
 			/* setup BURST clock */
 			/*DPRINTK ("rtd520: loading %d into burst\n", timer); */
-			RtdBurstCounter(dev, timer);
+			writel(timer & 0x3ff, devpriv->las0 + LAS0_BCLK);
 		}
 
 		break;