From 45cc8552c259e1182c0cfecc5702ec5463d950e4 Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <linux@treblig.org>
Date: Thu, 25 Aug 2011 16:13:55 -0700
Subject: [PATCH] --- yaml --- r: 287222 b: refs/heads/master c:
 d07a74a546981a09ba490936645fbf0d1340b96c h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/dma/at_hdmac.c      |  4 ++--
 trunk/drivers/dma/at_hdmac_regs.h | 17 +++++++++--------
 trunk/drivers/dma/dmatest.c       |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 9b3bb6231c6e..de2c1ddb6bfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bda3a47c886664e86ee14eb79e9072b9e341f575
+refs/heads/master: d07a74a546981a09ba490936645fbf0d1340b96c
diff --git a/trunk/drivers/dma/at_hdmac.c b/trunk/drivers/dma/at_hdmac.c
index f4aed5fc2cb6..97f87b29b9f3 100644
--- a/trunk/drivers/dma/at_hdmac.c
+++ b/trunk/drivers/dma/at_hdmac.c
@@ -1343,7 +1343,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
 
 		tasklet_init(&atchan->tasklet, atc_tasklet,
 				(unsigned long)atchan);
-		atc_enable_chan_irq(atdma, i);
+		atc_enable_irq(atchan);
 	}
 
 	/* set base routines */
@@ -1410,7 +1410,7 @@ static int __exit at_dma_remove(struct platform_device *pdev)
 		struct at_dma_chan	*atchan = to_at_dma_chan(chan);
 
 		/* Disable interrupts */
-		atc_disable_chan_irq(atdma, chan->chan_id);
+		atc_disable_irq(atchan);
 		tasklet_disable(&atchan->tasklet);
 
 		tasklet_kill(&atchan->tasklet);
diff --git a/trunk/drivers/dma/at_hdmac_regs.h b/trunk/drivers/dma/at_hdmac_regs.h
index a8d3277d60b5..dcaedfc181cf 100644
--- a/trunk/drivers/dma/at_hdmac_regs.h
+++ b/trunk/drivers/dma/at_hdmac_regs.h
@@ -327,27 +327,28 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
 }
 
 
-static void atc_setup_irq(struct at_dma *atdma, int chan_id, int on)
+static void atc_setup_irq(struct at_dma_chan *atchan, int on)
 {
-	u32 ebci;
+	struct at_dma	*atdma = to_at_dma(atchan->chan_common.device);
+	u32		ebci;
 
 	/* enable interrupts on buffer transfer completion & error */
-	ebci =    AT_DMA_BTC(chan_id)
-		| AT_DMA_ERR(chan_id);
+	ebci =    AT_DMA_BTC(atchan->chan_common.chan_id)
+		| AT_DMA_ERR(atchan->chan_common.chan_id);
 	if (on)
 		dma_writel(atdma, EBCIER, ebci);
 	else
 		dma_writel(atdma, EBCIDR, ebci);
 }
 
-static void atc_enable_chan_irq(struct at_dma *atdma, int chan_id)
+static inline void atc_enable_irq(struct at_dma_chan *atchan)
 {
-	atc_setup_irq(atdma, chan_id, 1);
+	atc_setup_irq(atchan, 1);
 }
 
-static void atc_disable_chan_irq(struct at_dma *atdma, int chan_id)
+static inline void atc_disable_irq(struct at_dma_chan *atchan)
 {
-	atc_setup_irq(atdma, chan_id, 0);
+	atc_setup_irq(atchan, 0);
 }
 
 
diff --git a/trunk/drivers/dma/dmatest.c b/trunk/drivers/dma/dmatest.c
index 2b8661b54eaf..24225f0fdcd8 100644
--- a/trunk/drivers/dma/dmatest.c
+++ b/trunk/drivers/dma/dmatest.c
@@ -599,7 +599,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
 	}
 	if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
 		cnt = dmatest_add_threads(dtc, DMA_PQ);
-		thread_count += cnt > 0 ?: 0;
+		thread_count += cnt > 0 ? cnt : 0;
 	}
 
 	pr_info("dmatest: Started %u threads using %s\n",