diff options
author | Per Forlin <per.forlin@linaro.org> | 2011-08-29 07:33:33 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2011-09-05 07:37:28 -0400 |
commit | 3b3d5b0f855b3eec45a02832e97c3c1890ff8823 (patch) | |
tree | 34a189e79c057c73faec8ebfb326524a612cb11b /drivers/dma | |
parent | da063d260969c4e5e5f91d911ba87f7f6b48ead0 (diff) |
dmaengine/ste_dma40: remove duplicate call to d40_pool_lli_free().
d40_desc_free() already calls d40_pool_lli_free().
Signed-off-by: Per Forlin <per.forlin@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/ste_dma40.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 486b6c0b44e3..37388d10497a 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c | |||
@@ -478,7 +478,6 @@ static struct d40_desc *d40_desc_get(struct d40_chan *d40c) | |||
478 | 478 | ||
479 | list_for_each_entry_safe(d, _d, &d40c->client, node) | 479 | list_for_each_entry_safe(d, _d, &d40c->client, node) |
480 | if (async_tx_test_ack(&d->txd)) { | 480 | if (async_tx_test_ack(&d->txd)) { |
481 | d40_pool_lli_free(d40c, d); | ||
482 | d40_desc_remove(d); | 481 | d40_desc_remove(d); |
483 | desc = d; | 482 | desc = d; |
484 | memset(desc, 0, sizeof(*desc)); | 483 | memset(desc, 0, sizeof(*desc)); |
@@ -1209,7 +1208,6 @@ static void dma_tasklet(unsigned long data) | |||
1209 | 1208 | ||
1210 | if (!d40d->cyclic) { | 1209 | if (!d40d->cyclic) { |
1211 | if (async_tx_test_ack(&d40d->txd)) { | 1210 | if (async_tx_test_ack(&d40d->txd)) { |
1212 | d40_pool_lli_free(d40c, d40d); | ||
1213 | d40_desc_remove(d40d); | 1211 | d40_desc_remove(d40d); |
1214 | d40_desc_free(d40c, d40d); | 1212 | d40_desc_free(d40c, d40d); |
1215 | } else { | 1213 | } else { |
@@ -1606,7 +1604,6 @@ static int d40_free_dma(struct d40_chan *d40c) | |||
1606 | /* Release client owned descriptors */ | 1604 | /* Release client owned descriptors */ |
1607 | if (!list_empty(&d40c->client)) | 1605 | if (!list_empty(&d40c->client)) |
1608 | list_for_each_entry_safe(d, _d, &d40c->client, node) { | 1606 | list_for_each_entry_safe(d, _d, &d40c->client, node) { |
1609 | d40_pool_lli_free(d40c, d); | ||
1610 | d40_desc_remove(d); | 1607 | d40_desc_remove(d); |
1611 | d40_desc_free(d40c, d); | 1608 | d40_desc_free(d40c, d); |
1612 | } | 1609 | } |