From: H Hartley Sweeten Date: Wed, 11 Jul 2012 00:11:29 +0000 (-0700) Subject: staging: comedi: rtd520: remove RtdDma0Source macro X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70fdb9739d9592ce806fe5bfb4644cd80ef689aa;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging: comedi: rtd520: remove RtdDma0Source 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 --- diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index ead842033351..847e98c299bd 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 */ -/* Set source for DMA 0 (write only, shadow?) */ -#define RtdDma0Source(dev, n) \ - writel((n) & 0xf, devpriv->las0+LAS0_DMA0_SRC) - /* Set source for DMA 1 (write only, shadow?) */ #define RtdDma1Source(dev, n) \ writel((n) & 0xf, devpriv->las0+LAS0_DMA1_SRC) @@ -1464,7 +1460,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) RtdDma0Mode(dev, DMA_MODE_BITS); RtdDma0Next(dev, /* point to first block */ devpriv->dma0Chain[DMA_CHAIN_COUNT - 1].next); - RtdDma0Source(dev, DMAS_ADFIFO_HALF_FULL); /* set DMA trigger source */ + writel(DMAS_ADFIFO_HALF_FULL, devpriv->las0 + LAS0_DMA0_SRC); RtdPlxInterruptWrite(dev, /* enable interrupt */ RtdPlxInterruptRead(dev) | ICS_DMA0_E); @@ -1961,7 +1957,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) RtdDma0Mode(dev, DMA_MODE_BITS); /* set DMA trigger source */ - RtdDma0Source(dev, DMAS_ADFIFO_HALF_FULL); + writel(DMAS_ADFIFO_HALF_FULL, devpriv->las0 + LAS0_DMA0_SRC); } else { printk(KERN_INFO "( no IRQ->no DMA )"); }