diff mbox

[v3,12/41] dmaengine: ioatdma: convert callback to helper function

Message ID 146887853215.16107.1385378572272371721.stgit@djiang5-desk3.ch.intel.com (mailing list archive)
State Changes Requested
Headers show

Commit Message

Dave Jiang July 18, 2016, 9:48 p.m. UTC 
Convert driver to use the new helper function for callback

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
 drivers/dma/ioat/dma.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index bd09961..82d2d66 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -568,12 +568,12 @@  static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete)
 
 		tx = &desc->txd;
 		if (tx->cookie) {
+			struct dmaengine_desc_callback cb;
+
 			dma_cookie_complete(tx);
 			dma_descriptor_unmap(tx);
-			if (tx->callback) {
-				tx->callback(tx->callback_param);
-				tx->callback = NULL;
-			}
+			dmaengine_desc_get_callback_invoke(tx, &cb, NULL);
+			tx->callback = NULL;
 		}
 
 		if (tx->phys == phys_complete)
@@ -705,12 +705,12 @@  static void ioat_eh(struct ioatdma_chan *ioat_chan)
 	} else { /* cleanup the faulty descriptor */
 		tx = &desc->txd;
 		if (tx->cookie) {
+			struct dmaengine_desc_callback cb;
+
 			dma_cookie_complete(tx);
 			dma_descriptor_unmap(tx);
-			if (tx->callback) {
-				tx->callback(tx->callback_param);
-				tx->callback = NULL;
-			}
+			dmaengine_desc_get_callback_invoke(tx, &cb, NULL);
+			tx->callback = NULL;
 		}
 	}