diff options
author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 02:28:12 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 02:28:12 -0400 |
commit | 949ff5b8d46b5e3435d21b2651ce3a2599208d44 (patch) | |
tree | c8fac55a7ae33271acb1fc12f5399e5494b97b47 /drivers/dma/timb_dma.c | |
parent | 8867bd508f88eae8b9c54394f17422f49e387b26 (diff) |
dmaengine: fix for cookie changes and merge
Fixed trivial issues in drivers:
drivers/dma/imx-sdma.c
drivers/dma/intel_mid_dma.c
drivers/dma/ioat/dma_v3.c
drivers/dma/iop-adma.c
drivers/dma/sirf-dma.c
drivers/dma/timb_dma.c
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/timb_dma.c')
-rw-r--r-- | drivers/dma/timb_dma.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c index 7805996661b8..d408c2206023 100644 --- a/drivers/dma/timb_dma.c +++ b/drivers/dma/timb_dma.c | |||
@@ -510,17 +510,13 @@ static void td_free_chan_resources(struct dma_chan *chan) | |||
510 | static enum dma_status td_tx_status(struct dma_chan *chan, dma_cookie_t cookie, | 510 | static enum dma_status td_tx_status(struct dma_chan *chan, dma_cookie_t cookie, |
511 | struct dma_tx_state *txstate) | 511 | struct dma_tx_state *txstate) |
512 | { | 512 | { |
513 | struct timb_dma_chan *td_chan = | ||
514 | container_of(chan, struct timb_dma_chan, chan); | ||
515 | enum dma_status ret; | 513 | enum dma_status ret; |
516 | 514 | ||
517 | dev_dbg(chan2dev(chan), "%s: Entry\n", __func__); | 515 | dev_dbg(chan2dev(chan), "%s: Entry\n", __func__); |
518 | 516 | ||
519 | ret = dma_cookie_status(chan, cookie, txstate); | 517 | ret = dma_cookie_status(chan, cookie, txstate); |
520 | 518 | ||
521 | dev_dbg(chan2dev(chan), | 519 | dev_dbg(chan2dev(chan), "%s: exit, ret: %d\n", __func__, ret); |
522 | "%s: exit, ret: %d, last_complete: %d, last_used: %d\n", | ||
523 | __func__, ret, last_complete, last_used); | ||
524 | 520 | ||
525 | return ret; | 521 | return ret; |
526 | } | 522 | } |