Commit 63992864 authored by Dave Jiang's avatar Dave Jiang Committed by Vinod Koul

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: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 48dc77e2
...@@ -570,11 +570,9 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) ...@@ -570,11 +570,9 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete)
if (tx->cookie) { if (tx->cookie) {
dma_cookie_complete(tx); dma_cookie_complete(tx);
dma_descriptor_unmap(tx); dma_descriptor_unmap(tx);
if (tx->callback) { dmaengine_desc_get_callback_invoke(tx, NULL);
tx->callback(tx->callback_param);
tx->callback = NULL; tx->callback = NULL;
} }
}
if (tx->phys == phys_complete) if (tx->phys == phys_complete)
seen_current = true; seen_current = true;
...@@ -707,12 +705,10 @@ static void ioat_eh(struct ioatdma_chan *ioat_chan) ...@@ -707,12 +705,10 @@ static void ioat_eh(struct ioatdma_chan *ioat_chan)
if (tx->cookie) { if (tx->cookie) {
dma_cookie_complete(tx); dma_cookie_complete(tx);
dma_descriptor_unmap(tx); dma_descriptor_unmap(tx);
if (tx->callback) { dmaengine_desc_get_callback_invoke(tx, NULL);
tx->callback(tx->callback_param);
tx->callback = NULL; tx->callback = NULL;
} }
} }
}
writel(chanerr, ioat_chan->reg_base + IOAT_CHANERR_OFFSET); writel(chanerr, ioat_chan->reg_base + IOAT_CHANERR_OFFSET);
pci_write_config_dword(pdev, IOAT_PCI_CHANERR_INT_OFFSET, chanerr_int); pci_write_config_dword(pdev, IOAT_PCI_CHANERR_INT_OFFSET, chanerr_int);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment