aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2016-07-20 16:11:33 -0400
committerVinod Koul <vinod.koul@intel.com>2016-08-07 22:41:39 -0400
commit63992864a2a55026fb11d1c9c686d348b205ce1f (patch)
treef74e45c946d90a9e151a7eccc009025a7eae4124 /drivers/dma/ioat
parent48dc77e2d4fc2e5d85da6e6892f228a75272d040 (diff)
dmaengine: ioatdma: convert callback to helper function
This is in preperation of moving to a callback that provides results to the callback for the transaction. The conversion will maintain current behavior and the driver must convert to new callback mechanism at a later time in order to receive results. Signed-off-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/ioat')
-rw-r--r--drivers/dma/ioat/dma.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index bd09961443b1..6499de4b8e79 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -570,10 +570,8 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete)
570 if (tx->cookie) { 570 if (tx->cookie) {
571 dma_cookie_complete(tx); 571 dma_cookie_complete(tx);
572 dma_descriptor_unmap(tx); 572 dma_descriptor_unmap(tx);
573 if (tx->callback) { 573 dmaengine_desc_get_callback_invoke(tx, NULL);
574 tx->callback(tx->callback_param); 574 tx->callback = NULL;
575 tx->callback = NULL;
576 }
577 } 575 }
578 576
579 if (tx->phys == phys_complete) 577 if (tx->phys == phys_complete)
@@ -707,10 +705,8 @@ static void ioat_eh(struct ioatdma_chan *ioat_chan)
707 if (tx->cookie) { 705 if (tx->cookie) {
708 dma_cookie_complete(tx); 706 dma_cookie_complete(tx);
709 dma_descriptor_unmap(tx); 707 dma_descriptor_unmap(tx);
710 if (tx->callback) { 708 dmaengine_desc_get_callback_invoke(tx, NULL);
711 tx->callback(tx->callback_param); 709 tx->callback = NULL;
712 tx->callback = NULL;
713 }
714 } 710 }
715 } 711 }
716 712