dmaengine: tegra: fix incompatible pointer type warns
authorVinod Koul <vinod.koul@intel.com>
Mon, 8 Dec 2014 06:00:17 +0000 (11:30 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 22 Dec 2014 07:04:23 +0000 (12:34 +0530)
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>
drivers/dma/tegra20-apb-dma.c

index 02f6013b83752d83af2f4305dbcc6e967a0e3eeb..5695fb8a7a244e28aeebe769d9ff31f32a16980e 100644 (file)
@@ -723,7 +723,7 @@ end:
        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 @@ skip_dma_stop:
                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,