staging: comedi: rtd520: remove RtdClearCGT macro

PATCH In review H Hartley Sweeten 1 participant 1 message Jul 10, 2012 Staging

Share & tools

H Hartley Sweeten

author

2012-07-10 23:41 UTC #0 lore raw

PATCH 3/83 staging: comedi: rtd520: remove RtdClearCGT 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 <[email protected]>

Cc Ian Abbott <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

---
 drivers/staging/comedi/drivers/rtd520.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

drivers/staging/comedi/drivers/rtd520.c +3 -6

index ff30253..781f081 100644
@@ -407,10 +407,6 @@ struct rtdPrivate {
 /* Macros to access registers */
 
 /* Reset channel gain table read and write pointers */
-#define RtdClearCGT(dev) \
-	writel(0, devpriv->las0+LAS0_CGT_CLEAR)
-
-/* Reset channel gain table read and write pointers */
 #define RtdEnableCGT(dev, v) \
 	writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_CGT_ENABLE)

@@ -797,7 +793,8 @@ static void rtd_load_channelgain_list(struct comedi_device *dev,
 {
 	if (n_chan > 1) {	/* setup channel gain table */
 		int ii;
-		RtdClearCGT(dev);
+
+		writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
 		RtdEnableCGT(dev, 1);	/* enable table */
 		for (ii = 0; ii < n_chan; ii++) {
 			RtdWriteCGTable(dev, rtdConvertChanGain(dev, list[ii],

@@ -2049,7 +2046,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	RtdInterruptClearMask(dev, ~0);	/* and sets shadow */
 	RtdInterruptClear(dev);	/* clears bits set by mask */
 	RtdInterruptOverrunClear(dev);
-	RtdClearCGT(dev);
+	writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
 	RtdAdcClearFifo(dev);
 	RtdDacClearFifo(dev, 0);
 	RtdDacClearFifo(dev, 1);

Signature · 1 line

1.7.11