git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
dma
/
mpc512x_dma.c
diff --git
a/drivers/dma/mpc512x_dma.c
b/drivers/dma/mpc512x_dma.c
index
bbbd585
..
201e6e1
100644
(file)
--- a/
drivers/dma/mpc512x_dma.c
+++ b/
drivers/dma/mpc512x_dma.c
@@
-541,8
+541,8
@@
static void mpc_dma_issue_pending(struct dma_chan *chan)
/* Check request completion status */
static enum dma_status
/* Check request completion status */
static enum dma_status
-mpc_dma_
is_tx_complete
(struct dma_chan *chan, dma_cookie_t cookie,
-
dma_cookie_t *done, dma_cookie_t *used
)
+mpc_dma_
tx_status
(struct dma_chan *chan, dma_cookie_t cookie,
+
struct dma_tx_state *txstate
)
{
struct mpc_dma_chan *mchan = dma_chan_to_mpc_dma_chan(chan);
unsigned long flags;
{
struct mpc_dma_chan *mchan = dma_chan_to_mpc_dma_chan(chan);
unsigned long flags;
@@
-554,12
+554,7
@@
mpc_dma_is_tx_complete(struct dma_chan *chan, dma_cookie_t cookie,
last_complete = mchan->completed_cookie;
spin_unlock_irqrestore(&mchan->lock, flags);
last_complete = mchan->completed_cookie;
spin_unlock_irqrestore(&mchan->lock, flags);
- if (done)
- *done = last_complete;
-
- if (used)
- *used = last_used;
-
+ dma_set_tx_state(txstate, last_complete, last_used, 0);
return dma_async_is_complete(cookie, last_complete, last_used);
}
return dma_async_is_complete(cookie, last_complete, last_used);
}
@@
-663,7
+658,7
@@
static int __devinit mpc_dma_probe(struct of_device *op,
}
regs_start = res.start;
}
regs_start = res.start;
- regs_size = res
.end - res.start + 1
;
+ regs_size = res
ource_size(&res)
;
if (!devm_request_mem_region(dev, regs_start, regs_size, DRV_NAME)) {
dev_err(dev, "Error requesting memory region!\n");
if (!devm_request_mem_region(dev, regs_start, regs_size, DRV_NAME)) {
dev_err(dev, "Error requesting memory region!\n");
@@
-694,7
+689,7
@@
static int __devinit mpc_dma_probe(struct of_device *op,
dma->device_alloc_chan_resources = mpc_dma_alloc_chan_resources;
dma->device_free_chan_resources = mpc_dma_free_chan_resources;
dma->device_issue_pending = mpc_dma_issue_pending;
dma->device_alloc_chan_resources = mpc_dma_alloc_chan_resources;
dma->device_free_chan_resources = mpc_dma_free_chan_resources;
dma->device_issue_pending = mpc_dma_issue_pending;
- dma->device_
is_tx_complete = mpc_dma_is_tx_complete
;
+ dma->device_
tx_status = mpc_dma_tx_status
;
dma->device_prep_dma_memcpy = mpc_dma_prep_memcpy;
INIT_LIST_HEAD(&dma->channels);
dma->device_prep_dma_memcpy = mpc_dma_prep_memcpy;
INIT_LIST_HEAD(&dma->channels);