diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2012-03-06 17:34:06 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 02:06:06 -0400 |
commit | 4d4e58de32a192fea65ab84509d17d199bd291c8 (patch) | |
tree | be35531778c9cc6bee73beb94d07e176a6f3599d /drivers/dma/fsldma.c | |
parent | 08714f60b0fc6ea3a060b69b32e77139f14e6045 (diff) |
dmaengine: move last completed cookie into generic dma_chan structure
Every DMA engine implementation declares a last completed dma cookie
in their private dma channel structures. This is pointless, and
forces driver specific code. Move this out into the common dma_chan
structure.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
[imx-sdma.c & mxs-dma.c]
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/fsldma.c')
-rw-r--r-- | drivers/dma/fsldma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index b98070c33ca9..9b5cb8a43cfa 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c | |||
@@ -990,7 +990,7 @@ static enum dma_status fsl_tx_status(struct dma_chan *dchan, | |||
990 | 990 | ||
991 | spin_lock_irqsave(&chan->desc_lock, flags); | 991 | spin_lock_irqsave(&chan->desc_lock, flags); |
992 | 992 | ||
993 | last_complete = chan->completed_cookie; | 993 | last_complete = dchan->completed_cookie; |
994 | last_used = dchan->cookie; | 994 | last_used = dchan->cookie; |
995 | 995 | ||
996 | spin_unlock_irqrestore(&chan->desc_lock, flags); | 996 | spin_unlock_irqrestore(&chan->desc_lock, flags); |
@@ -1088,7 +1088,7 @@ static void dma_do_tasklet(unsigned long data) | |||
1088 | desc = to_fsl_desc(chan->ld_running.prev); | 1088 | desc = to_fsl_desc(chan->ld_running.prev); |
1089 | cookie = desc->async_tx.cookie; | 1089 | cookie = desc->async_tx.cookie; |
1090 | 1090 | ||
1091 | chan->completed_cookie = cookie; | 1091 | chan->common.completed_cookie = cookie; |
1092 | chan_dbg(chan, "completed_cookie=%d\n", cookie); | 1092 | chan_dbg(chan, "completed_cookie=%d\n", cookie); |
1093 | } | 1093 | } |
1094 | 1094 | ||