提交 a29c3956 编写于 作者: V Vinod Koul

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: NVinod Koul <vinod.koul@intel.com>
上级 6269591b
...@@ -281,7 +281,7 @@ static void mxs_dma_disable_chan(struct dma_chan *chan) ...@@ -281,7 +281,7 @@ static void mxs_dma_disable_chan(struct dma_chan *chan)
mxs_chan->status = DMA_COMPLETE; 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_chan *mxs_chan = to_mxs_dma_chan(chan);
struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
...@@ -296,9 +296,10 @@ static void mxs_dma_pause_chan(struct dma_chan *chan) ...@@ -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_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET);
mxs_chan->status = DMA_PAUSED; 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_chan *mxs_chan = to_mxs_dma_chan(chan);
struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
...@@ -313,6 +314,7 @@ static void mxs_dma_resume_chan(struct dma_chan *chan) ...@@ -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_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_CLR);
mxs_chan->status = DMA_IN_PROGRESS; mxs_chan->status = DMA_IN_PROGRESS;
return 0;
} }
static dma_cookie_t mxs_dma_tx_submit(struct dma_async_tx_descriptor *tx) static dma_cookie_t mxs_dma_tx_submit(struct dma_async_tx_descriptor *tx)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册