Skip to content

Commit

Permalink
dmaengine: mxs-dma: fix incompatible pointer type build warns
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vinod Koul committed Dec 22, 2014
1 parent 6269591 commit a29c395
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/dma/mxs-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit a29c395

Please sign in to comment.