aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Röjfors <richard.rojfors@pelagicore.com>2010-03-26 03:23:58 -0400
committerDan Williams <dan.j.williams@intel.com>2010-03-26 19:08:20 -0400
commit0f65169b1bf44220308e1ce1f6666ad03ddc27af (patch)
tree90f1e1955d63e876409ce54d8b9cbaf832619671
parentde5d4453c5b224eefd02b6a141ed411a76d458af (diff)
dma: timb-dma: Update comment and fix compiler warning
An incremental patch which clarifies what the spinlock is used for and fixes a compiler warning. Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/dma/timb_dma.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 4dd710246c79..145f1c23408f 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -79,7 +79,10 @@ struct timb_dma_desc {
79struct timb_dma_chan { 79struct timb_dma_chan {
80 struct dma_chan chan; 80 struct dma_chan chan;
81 void __iomem *membase; 81 void __iomem *membase;
82 spinlock_t lock; /* Used for mutual exclusion */ 82 spinlock_t lock; /* Used to protect data structures,
83 especially the lists and descriptors,
84 from races between the tasklet and calls
85 from above */
83 dma_cookie_t last_completed_cookie; 86 dma_cookie_t last_completed_cookie;
84 bool ongoing; 87 bool ongoing;
85 struct list_head active_list; 88 struct list_head active_list;
@@ -197,7 +200,7 @@ static int td_fill_desc(struct timb_dma_chan *td_chan, u8 *dma_desc,
197 } 200 }
198 201
199 dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: %p\n", 202 dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: %p\n",
200 dma_desc, (void *)(int)sg_dma_address(sg)); 203 dma_desc, (void *)sg_dma_address(sg));
201 204
202 dma_desc[7] = (sg_dma_address(sg) >> 24) & 0xff; 205 dma_desc[7] = (sg_dma_address(sg) >> 24) & 0xff;
203 dma_desc[6] = (sg_dma_address(sg) >> 16) & 0xff; 206 dma_desc[6] = (sg_dma_address(sg) >> 16) & 0xff;