staging: comedi: rtd520: remove RtdDma0Mode macro

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

Share & tools

H Hartley Sweeten

author

2012-07-11 00:14 UTC #0 lore raw

PATCH 64/83 staging: comedi: rtd520: remove RtdDma0Mode 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 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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

index 202e1d8..46d892a 100644
@@ -406,10 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Set  mode for DMA 0 */
-#define RtdDma0Mode(dev, m) \
-	writel((m), devpriv->lcfg+LCFG_DMAMODE0)
-
 /* Set PCI address for DMA 0 */
 #define RtdDma0PciAddr(dev, a) \
 	writel((a), devpriv->lcfg+LCFG_DMAPADR0)

@@ -1438,7 +1434,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 		/* point to first transfer in ring */
 		devpriv->dma0Offset = 0;
-		RtdDma0Mode(dev, DMA_MODE_BITS);
+		writel(DMA_MODE_BITS, devpriv->lcfg + LCFG_DMAMODE0);
 		RtdDma0Next(dev,	/* point to first block */
 			    devpriv->dma0Chain[DMA_CHAIN_COUNT - 1].next);
 		writel(DMAS_ADFIFO_HALF_FULL, devpriv->las0 + LAS0_DMA0_SRC);

@@ -1935,7 +1931,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 			goto rtd_attach_die_error;
 		}
 
-		RtdDma0Mode(dev, DMA_MODE_BITS);
+		writel(DMA_MODE_BITS, devpriv->lcfg + LCFG_DMAMODE0);
 		/* set DMA trigger source */
 		writel(DMAS_ADFIFO_HALF_FULL, devpriv->las0 + LAS0_DMA0_SRC);
 	} else {

Signature · 1 line

1.7.11