diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-12-08 06:57:08 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-22 08:04:23 +0100 |
| commit | 35e639d1f7571a1f194999910e4b0be6a81356ea (patch) | |
| tree | 8a03c29100a74e62c4e2b976c525be79eef60d32 /drivers/dma/ste_dma40.c | |
| parent | dmaengine: mxs-dma: fix unused variable warn (diff) | |
| download | linux-35e639d1f7571a1f194999910e4b0be6a81356ea.tar.xz linux-35e639d1f7571a1f194999910e4b0be6a81356ea.zip | |
dmaengine: ste_dma: fix incompatible pointer type warns
drivers/dma/ste_dma40.c:2627:3: warning: 'return' with a value, in function returning void [enabled by default]
drivers/dma/ste_dma40.c: In function 'd40_ops_init':
drivers/dma/ste_dma40.c:2869:28: 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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/dma/ste_dma40.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index e5a284865e92..68aca3334a17 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2616,7 +2616,7 @@ static void d40_issue_pending(struct dma_chan *chan) spin_unlock_irqrestore(&d40c->lock, flags); } -static void d40_terminate_all(struct dma_chan *chan) +static int d40_terminate_all(struct dma_chan *chan) { unsigned long flags; struct d40_chan *d40c = container_of(chan, struct d40_chan, chan); @@ -2644,6 +2644,7 @@ static void d40_terminate_all(struct dma_chan *chan) d40c->busy = false; spin_unlock_irqrestore(&d40c->lock, flags); + return 0; } static int |