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

Commit a29c3956 authored by Vinod Koul's avatar Vinod Koul
Browse files

dmaengine: mxs-dma: fix incompatible pointer type build warns 



drivers/dma/mxs-dma.c: In function 'mxs_dma_probe':
drivers/dma/mxs-dma.c:848:35: warning: assignment from incompatible pointer type [enabled by default]
drivers/dma/mxs-dma.c:849:36: warning: assignment from incompatible pointer type [enabled by default]

The function prototype expects return type 'int' whereas these where void

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 6269591b

drivers/dma/mxs-dma.c

+4 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void mxs_dma_disable_chan(struct dma_chan *chan) 
	mxs_chan->status = DMA_COMPLETE;

}



static void mxs_dma_pause_chan(struct dma_chan *chan)

static int mxs_dma_pause_chan(struct dma_chan *chan)

{

	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
@@ -296,9 +296,10 @@ static void mxs_dma_pause_chan(struct dma_chan *chan) 
			mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET);



	mxs_chan->status = DMA_PAUSED;

	return 0;

}



static void mxs_dma_resume_chan(struct dma_chan *chan)

static int mxs_dma_resume_chan(struct dma_chan *chan)

{

	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
@@ -313,6 +314,7 @@ static void mxs_dma_resume_chan(struct dma_chan *chan) 
			mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_CLR);



	mxs_chan->status = DMA_IN_PROGRESS;

	return 0;

}



static dma_cookie_t mxs_dma_tx_submit(struct dma_async_tx_descriptor *tx)