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

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

dmaengine: ipu: 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 db89e3c8

drivers/dma/ipu/ipu_idmac.c

+8 −10
Original line number Diff line number Diff line
@@ -1160,11 +1160,10 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id) 
	struct scatterlist **sg, *sgnext, *sgnew = NULL;

	/* Next transfer descriptor */

	struct idmac_tx_desc *desc, *descnew;

	dma_async_tx_callback callback;

	void *callback_param;

	bool done = false;

	u32 ready0, ready1, curbuf, err;

	unsigned long flags;

	struct dmaengine_desc_callback cb;



	/* IDMAC has cleared the respective BUFx_RDY bit, we manage the buffer */
@@ -1278,12 +1277,12 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id) 


	if (likely(sgnew) &&

	    ipu_submit_buffer(ichan, descnew, sgnew, ichan->active_buffer) < 0) {

		callback = descnew->txd.callback;

		callback_param = descnew->txd.callback_param;

		dmaengine_desc_get_callback(&descnew->txd, &cb);



		list_del_init(&descnew->list);

		spin_unlock(&ichan->lock);

		if (callback)

			callback(callback_param);



		dmaengine_desc_callback_invoke(&cb, NULL);

		spin_lock(&ichan->lock);

	}
@@ -1292,13 +1291,12 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id) 
	if (done)

		dma_cookie_complete(&desc->txd);



	callback = desc->txd.callback;

	callback_param = desc->txd.callback_param;

	dmaengine_desc_get_callback(&desc->txd, &cb);



	spin_unlock(&ichan->lock);



	if (done && (desc->txd.flags & DMA_PREP_INTERRUPT) && callback)

		callback(callback_param);

	if (done && (desc->txd.flags & DMA_PREP_INTERRUPT))

		dmaengine_desc_callback_invoke(&cb, NULL);



	return IRQ_HANDLED;

}