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

Commit d3ee98cd authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Vinod Koul
Browse files

dmaengine: consolidate initialization of cookies 



Provide a common function to initialize a channels cookie values.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarJassi Brar <jassisinghbrar@gmail.com>
[imx-sdma.c & mxs-dma.c]
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 96a2af41

drivers/dma/amba-pl08x.c

+1 −2
Original line number Diff line number Diff line
@@ -1709,8 +1709,7 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x, 
			 chan->name);



		chan->chan.device = dmadev;

		chan->chan.cookie = 0;

		chan->chan.completed_cookie = 0;

		dma_cookie_init(&chan->chan);



		spin_lock_init(&chan->lock);

		INIT_LIST_HEAD(&chan->pend_list);

drivers/dma/at_hdmac.c

+2 −2
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ static int atc_alloc_chan_resources(struct dma_chan *chan) 
	spin_lock_irqsave(&atchan->lock, flags);

	atchan->descs_allocated = i;

	list_splice(&tmp_list, &atchan->free_list);

	chan->completed_cookie = chan->cookie = 1;

	dma_cookie_init(chan);

	spin_unlock_irqrestore(&atchan->lock, flags);



	/* channel parameters */
@@ -1303,7 +1303,7 @@ static int __init at_dma_probe(struct platform_device *pdev) 
		struct at_dma_chan	*atchan = &atdma->chan[i];



		atchan->chan_common.device = &atdma->dma_common;

		atchan->chan_common.cookie = atchan->chan_common.completed_cookie = 1;

		dma_cookie_init(&atchan->chan_common);

		list_add_tail(&atchan->chan_common.device_node,

				&atdma->dma_common.channels);

drivers/dma/coh901318.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static int coh901318_alloc_chan_resources(struct dma_chan *chan) 
	coh901318_config(cohc, NULL);



	cohc->allocated = 1;

	chan->completed_cookie = chan->cookie = 1;

	dma_cookie_init(chan);



	spin_unlock_irqrestore(&cohc->lock, flags);

drivers/dma/dmaengine.h

+10 −0
Original line number Diff line number Diff line
@@ -8,6 +8,16 @@ 
#include <linux/bug.h>

#include <linux/dmaengine.h>



/**

 * dma_cookie_init - initialize the cookies for a DMA channel

 * @chan: dma channel to initialize

 */

static inline void dma_cookie_init(struct dma_chan *chan)

{

	chan->cookie = DMA_MIN_COOKIE;

	chan->completed_cookie = DMA_MIN_COOKIE;

}



/**

 * dma_cookie_assign - assign a DMA engine cookie to the descriptor

 * @tx: descriptor needing cookie

drivers/dma/dw_dmac.c

+2 −2
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan) 
		return -EIO;

	}



	chan->completed_cookie = chan->cookie = 1;

	dma_cookie_init(chan);



	/*

	 * NOTE: some controllers may have additional features that we
@@ -1449,7 +1449,7 @@ static int __init dw_probe(struct platform_device *pdev) 
		struct dw_dma_chan	*dwc = &dw->chan[i];



		dwc->chan.device = &dw->dma;

		dwc->chan.cookie = dwc->chan.completed_cookie = 1;

		dma_cookie_init(&dwc->chan);

		if (pdata->chan_allocation_order == CHAN_ALLOCATION_ASCENDING)

			list_add_tail(&dwc->chan.device_node,

					&dw->dma.channels);