mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
dmaengine: tegra: fix incompatible pointer type warns
drivers/dma/tegra20-apb-dma.c:1428:37: warning: assignment from incompatible pointer type [enabled by default] drivers/dma/ste_dma40.c: In function 'd40_terminate_all': The function prototype expects return type 'int' whereas these where void Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
parent
35e639d1f7
commit
a7c439a458
1 changed files with 3 additions and 2 deletions
|
@ -723,7 +723,7 @@ static void tegra_dma_issue_pending(struct dma_chan *dc)
|
|||
return;
|
||||
}
|
||||
|
||||
static void tegra_dma_terminate_all(struct dma_chan *dc)
|
||||
static int tegra_dma_terminate_all(struct dma_chan *dc)
|
||||
{
|
||||
struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
|
||||
struct tegra_dma_sg_req *sgreq;
|
||||
|
@ -736,7 +736,7 @@ static void tegra_dma_terminate_all(struct dma_chan *dc)
|
|||
spin_lock_irqsave(&tdc->lock, flags);
|
||||
if (list_empty(&tdc->pending_sg_req)) {
|
||||
spin_unlock_irqrestore(&tdc->lock, flags);
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!tdc->busy)
|
||||
|
@ -777,6 +777,7 @@ static void tegra_dma_terminate_all(struct dma_chan *dc)
|
|||
dma_desc->cb_count = 0;
|
||||
}
|
||||
spin_unlock_irqrestore(&tdc->lock, flags);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static enum dma_status tegra_dma_tx_status(struct dma_chan *dc,
|
||||
|
|
Loading…
Reference in a new issue