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

Commit 9f92d223 authored by Joe Perches's avatar Joe Perches Committed by Vinod Koul
Browse files

dmaengine: Use dma_zalloc_coherent 



Use the zeroing function instead of dma_alloc_coherent & memset(,0,)

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 89751d0a

drivers/dma/imx-sdma.c

+2 −3
Original line number Diff line number Diff line
@@ -911,14 +911,13 @@ static int sdma_request_channel(struct sdma_channel *sdmac) 
	int channel = sdmac->channel;

	int ret = -EBUSY;



	sdmac->bd = dma_alloc_coherent(NULL, PAGE_SIZE, &sdmac->bd_phys, GFP_KERNEL);

	sdmac->bd = dma_zalloc_coherent(NULL, PAGE_SIZE, &sdmac->bd_phys,

					GFP_KERNEL);

	if (!sdmac->bd) {

		ret = -ENOMEM;

		goto out;

	}



	memset(sdmac->bd, 0, PAGE_SIZE);



	sdma->channel_control[channel].base_bd_ptr = sdmac->bd_phys;

	sdma->channel_control[channel].current_bd_ptr = sdmac->bd_phys;

drivers/dma/mxs-dma.c

+3 −5
Original line number Diff line number Diff line
@@ -413,16 +413,14 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) 
	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;

	int ret;



	mxs_chan->ccw = dma_alloc_coherent(mxs_dma->dma_device.dev,

				CCW_BLOCK_SIZE, &mxs_chan->ccw_phys,

				GFP_KERNEL);

	mxs_chan->ccw = dma_zalloc_coherent(mxs_dma->dma_device.dev,

					    CCW_BLOCK_SIZE,

					    &mxs_chan->ccw_phys, GFP_KERNEL);

	if (!mxs_chan->ccw) {

		ret = -ENOMEM;

		goto err_alloc;

	}



	memset(mxs_chan->ccw, 0, CCW_BLOCK_SIZE);



	if (mxs_chan->chan_irq != NO_IRQ) {

		ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler,

					0, "mxs-dma", mxs_dma);