OSDN Git Service

dmaengine: ste_dma: fix incompatible pointer type warns
authorVinod Koul <vinod.koul@intel.com>
Mon, 8 Dec 2014 05:57:08 +0000 (11:27 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 22 Dec 2014 07:04:23 +0000 (12:34 +0530)
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>
drivers/dma/ste_dma40.c

index e5a2848..68aca33 100644 (file)
@@ -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