aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2014-12-08 00:57:08 -0500
committerVinod Koul <vinod.koul@intel.com>2014-12-22 02:04:23 -0500
commit35e639d1f7571a1f194999910e4b0be6a81356ea (patch)
tree8a03c29100a74e62c4e2b976c525be79eef60d32
parentf67bcc404249ed3fdedec250b24c705564802f21 (diff)
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>
-rw-r--r--drivers/dma/ste_dma40.c3
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)
2616 spin_unlock_irqrestore(&d40c->lock, flags); 2616 spin_unlock_irqrestore(&d40c->lock, flags);
2617} 2617}
2618 2618
2619static void d40_terminate_all(struct dma_chan *chan) 2619static int d40_terminate_all(struct dma_chan *chan)
2620{ 2620{
2621 unsigned long flags; 2621 unsigned long flags;
2622 struct d40_chan *d40c = container_of(chan, struct d40_chan, chan); 2622 struct d40_chan *d40c = container_of(chan, struct d40_chan, chan);
@@ -2644,6 +2644,7 @@ static void d40_terminate_all(struct dma_chan *chan)
2644 d40c->busy = false; 2644 d40c->busy = false;
2645 2645
2646 spin_unlock_irqrestore(&d40c->lock, flags); 2646 spin_unlock_irqrestore(&d40c->lock, flags);
2647 return 0;
2647} 2648}
2648 2649
2649static int 2650static int