Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7c439a4 authored by Vinod Koul's avatar Vinod Koul
Browse files

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: default avatarVinod Koul <vinod.koul@intel.com>
parent 35e639d1

drivers/dma/tegra20-apb-dma.c

+3 −2
Original line number Diff line number Diff line
@@ -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,