From a6ea748b15c4932e17ebc516cf9a74f09ceb1d67 Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Tue, 25 Jan 2011 11:18:18 +0100 Subject: dma40: combine desc init functions The desc init code can be shared between the mem and slave prep routines. Change-Id: I4567ec077535cc24b4ebe68f94e8e7e34394de23 Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32256 Tested-by: Narayanan GOPALAKRISHNAN Reviewed-by: QATEST Reviewed-by: Jonas ABERG --- drivers/dma/ste_dma40.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'drivers/dma') diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 42d5b3eea80..750de9495cb 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1953,6 +1953,26 @@ _exit: } +static struct d40_desc * +d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg, + unsigned int sg_len, unsigned long dma_flags) +{ + struct d40_desc *desc; + + desc = d40_desc_get(chan); + if (!desc) + return NULL; + + desc->lli_len = sg_len; + desc->lli_current = 0; + desc->txd.flags = dma_flags; + desc->txd.tx_submit = d40_tx_submit; + + dma_async_tx_descriptor_init(&desc->txd, &chan->chan); + + return desc; +} + struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, struct scatterlist *sgl_dst, struct scatterlist *sgl_src, @@ -1971,14 +1991,11 @@ struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, } spin_lock_irqsave(&d40c->lock, flags); - d40d = d40_desc_get(d40c); - if (d40d == NULL) - goto err; + d40d = d40_prep_desc(d40c, sgl_dst, sgl_len, dma_flags); - d40d->lli_len = sgl_len; - d40d->lli_current = 0; - d40d->txd.flags = dma_flags; + if (!d40d) + goto err; if (chan_is_logical(d40c)) { @@ -2037,10 +2054,6 @@ struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, d40d->lli_pool.size, DMA_TO_DEVICE); } - dma_async_tx_descriptor_init(&d40d->txd, chan); - - d40d->txd.tx_submit = d40_tx_submit; - spin_unlock_irqrestore(&d40c->lock, flags); return &d40d->txd; @@ -2280,9 +2293,6 @@ static int d40_prep_slave_sg_log(struct d40_desc *d40d, return -ENOMEM; } - d40d->lli_len = sg_len; - d40d->lli_current = 0; - if (direction == DMA_FROM_DEVICE) dev_addr = d40_dev_rx_addr(d40c); else if (direction == DMA_TO_DEVICE) @@ -2319,9 +2329,6 @@ static int d40_prep_slave_sg_phy(struct d40_desc *d40d, return -ENOMEM; } - d40d->lli_len = sgl_len; - d40d->lli_current = 0; - if (direction == DMA_FROM_DEVICE) { dst_dev_addr = 0; src_dev_addr = d40_dev_rx_addr(d40c); @@ -2380,7 +2387,7 @@ d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, } spin_lock_irqsave(&d40c->lock, flags); - d40d = d40_desc_get(d40c); + d40d = d40_prep_desc(d40c, sgl, sg_len, dma_flags); if (d40d == NULL) goto err; @@ -2400,12 +2407,6 @@ d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, goto err; } - d40d->txd.flags = dma_flags; - - dma_async_tx_descriptor_init(&d40d->txd, chan); - - d40d->txd.tx_submit = d40_tx_submit; - spin_unlock_irqrestore(&d40c->lock, flags); return &d40d->txd; -- cgit v1.2.3