diff options
author | Vinod Koul <vinod.koul@intel.com> | 2014-12-08 00:54:09 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-22 02:04:23 -0500 |
commit | a29c3956369b0a993fc41d4ec29289587bd16249 (patch) | |
tree | 28200cce1bb668720c6baa3d553f5ea9c4e2b4b9 | |
parent | 6269591b989878992be443f77caa9ca4738dfaaf (diff) |
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: Vinod Koul <vinod.koul@intel.com>
-rw-r--r-- | drivers/dma/mxs-dma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index a24af4fc24e9..bf286aa6b227 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c | |||
@@ -281,7 +281,7 @@ static void mxs_dma_disable_chan(struct dma_chan *chan) | |||
281 | mxs_chan->status = DMA_COMPLETE; | 281 | mxs_chan->status = DMA_COMPLETE; |
282 | } | 282 | } |
283 | 283 | ||
284 | static void mxs_dma_pause_chan(struct dma_chan *chan) | 284 | static int mxs_dma_pause_chan(struct dma_chan *chan) |
285 | { | 285 | { |
286 | struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); | 286 | struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); |
287 | struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; | 287 | 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 | mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET); | 296 | mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET); |
297 | 297 | ||
298 | mxs_chan->status = DMA_PAUSED; | 298 | mxs_chan->status = DMA_PAUSED; |
299 | return 0; | ||
299 | } | 300 | } |
300 | 301 | ||
301 | static void mxs_dma_resume_chan(struct dma_chan *chan) | 302 | static int mxs_dma_resume_chan(struct dma_chan *chan) |
302 | { | 303 | { |
303 | struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); | 304 | struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); |
304 | struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; | 305 | 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 | mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_CLR); | 314 | mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_CLR); |
314 | 315 | ||
315 | mxs_chan->status = DMA_IN_PROGRESS; | 316 | mxs_chan->status = DMA_IN_PROGRESS; |
317 | return 0; | ||
316 | } | 318 | } |
317 | 319 | ||
318 | static dma_cookie_t mxs_dma_tx_submit(struct dma_async_tx_descriptor *tx) | 320 | static dma_cookie_t mxs_dma_tx_submit(struct dma_async_tx_descriptor *tx) |