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

Commit 96622bde authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/unmap_cleanup' into for-linus

parents 7afb1fa8 fd3c69bd

drivers/dma/fsl_raid.c

+1 −1
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ static void fsl_re_issue_pending(struct dma_chan *chan) 
static void fsl_re_desc_done(struct fsl_re_desc *desc)

{

	dma_cookie_complete(&desc->async_tx);

	dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL);

	dma_descriptor_unmap(&desc->async_tx);

	dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL);

}



static void fsl_re_cleanup_descs(struct fsl_re_chan *re_chan)

drivers/dma/fsldma.c

+1 −1
Original line number Diff line number Diff line
@@ -516,9 +516,9 @@ static dma_cookie_t fsldma_run_tx_complete_actions(struct fsldma_chan *chan, 
	if (txd->cookie > 0) {

		ret = txd->cookie;



		dma_descriptor_unmap(txd);

		/* Run the link descriptor callback function */

		dmaengine_desc_get_callback_invoke(txd, NULL);

		dma_descriptor_unmap(txd);

	}



	/* Run any dependencies */

drivers/dma/mv_xor.c

+1 −1
Original line number Diff line number Diff line
@@ -206,11 +206,11 @@ mv_desc_run_tx_complete_actions(struct mv_xor_desc_slot *desc, 
	if (desc->async_tx.cookie > 0) {

		cookie = desc->async_tx.cookie;



		dma_descriptor_unmap(&desc->async_tx);

		/* call the callback (must not sleep or submit new

		 * operations to this channel)

		 */

		dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL);

		dma_descriptor_unmap(&desc->async_tx);

	}



	/* run dependent operations */

drivers/dma/ppc4xx/adma.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,11 +1482,11 @@ static dma_cookie_t ppc440spe_adma_run_tx_complete_actions( 
		cookie = desc->async_tx.cookie;

		desc->async_tx.cookie = 0;



		dma_descriptor_unmap(&desc->async_tx);

		/* call the callback (must not sleep or submit new

		 * operations to this channel)

		 */

		dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL);

		dma_descriptor_unmap(&desc->async_tx);

	}



	/* run dependent operations */

drivers/dma/xgene-dma.c

+1 −2
Original line number Diff line number Diff line
@@ -606,12 +606,11 @@ static void xgene_dma_run_tx_complete_actions(struct xgene_dma_chan *chan, 
		return;



	dma_cookie_complete(tx);

	dma_descriptor_unmap(tx);



	/* Run the link descriptor callback function */

	dmaengine_desc_get_callback_invoke(tx, NULL);



	dma_descriptor_unmap(tx);



	/* Run any dependencies */

	dma_run_dependencies(tx);

}