diff options
Diffstat (limited to 'drivers/dma/mxs-dma.c')
-rw-r--r-- | drivers/dma/mxs-dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 9f02e794b12b..8f6d30d37c45 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c | |||
@@ -109,7 +109,7 @@ struct mxs_dma_chan { | |||
109 | struct dma_chan chan; | 109 | struct dma_chan chan; |
110 | struct dma_async_tx_descriptor desc; | 110 | struct dma_async_tx_descriptor desc; |
111 | struct tasklet_struct tasklet; | 111 | struct tasklet_struct tasklet; |
112 | int chan_irq; | 112 | unsigned int chan_irq; |
113 | struct mxs_dma_ccw *ccw; | 113 | struct mxs_dma_ccw *ccw; |
114 | dma_addr_t ccw_phys; | 114 | dma_addr_t ccw_phys; |
115 | int desc_count; | 115 | int desc_count; |
@@ -441,7 +441,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg( | |||
441 | struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; | 441 | struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; |
442 | struct mxs_dma_ccw *ccw; | 442 | struct mxs_dma_ccw *ccw; |
443 | struct scatterlist *sg; | 443 | struct scatterlist *sg; |
444 | int i, j; | 444 | u32 i, j; |
445 | u32 *pio; | 445 | u32 *pio; |
446 | bool append = flags & DMA_PREP_INTERRUPT; | 446 | bool append = flags & DMA_PREP_INTERRUPT; |
447 | int idx = append ? mxs_chan->desc_count : 0; | 447 | int idx = append ? mxs_chan->desc_count : 0; |
@@ -537,8 +537,8 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_dma_cyclic( | |||
537 | { | 537 | { |
538 | struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); | 538 | struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); |
539 | struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; | 539 | struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; |
540 | int num_periods = buf_len / period_len; | 540 | u32 num_periods = buf_len / period_len; |
541 | int i = 0, buf = 0; | 541 | u32 i = 0, buf = 0; |
542 | 542 | ||
543 | if (mxs_chan->status == DMA_IN_PROGRESS) | 543 | if (mxs_chan->status == DMA_IN_PROGRESS) |
544 | return NULL; | 544 | return NULL; |