summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2014-12-08 05:54:09 (GMT)
committerVinod Koul <vinod.koul@intel.com>2014-12-22 07:04:23 (GMT)
commita29c3956369b0a993fc41d4ec29289587bd16249 (patch)
tree28200cce1bb668720c6baa3d553f5ea9c4e2b4b9
parent6269591b989878992be443f77caa9ca4738dfaaf (diff)
downloadlinux-a29c3956369b0a993fc41d4ec29289587bd16249.tar.xz
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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index a24af4f..bf286aa 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)
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)