Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/dma/ioat/dma.c

+4 −8
Original line number Diff line number Diff line
@@ -570,11 +570,9 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) 
		if (tx->cookie) {

			dma_cookie_complete(tx);

			dma_descriptor_unmap(tx);

			if (tx->callback) {

				tx->callback(tx->callback_param);

			dmaengine_desc_get_callback_invoke(tx, NULL);

			tx->callback = NULL;

		}

		}



		if (tx->phys == phys_complete)

			seen_current = true;
@@ -707,12 +705,10 @@ static void ioat_eh(struct ioatdma_chan *ioat_chan) 
		if (tx->cookie) {

			dma_cookie_complete(tx);

			dma_descriptor_unmap(tx);

			if (tx->callback) {

				tx->callback(tx->callback_param);

			dmaengine_desc_get_callback_invoke(tx, NULL);

			tx->callback = NULL;

		}

	}

	}



	writel(chanerr, ioat_chan->reg_base + IOAT_CHANERR_OFFSET);

	pci_write_config_dword(pdev, IOAT_PCI_CHANERR_INT_OFFSET, chanerr_int);