clocksource: rockchip_timer: set clockevent irq flags include IRQF_PERCPU

[firefly-linux-kernel-4.4.55.git] / drivers / dma / coh901318_lli.c

diff --git a/drivers/dma/coh901318_lli.c b/drivers/dma/coh901318_lli.c
index 780e0429b38cd30236001e4a121cefc6fa347aea..702112d547c83214bb2f0e77cd8b3a879979e541 100644 (file)
--- a/drivers/dma/coh901318_lli.c
+++ b/drivers/dma/coh901318_lli.c
@@ -11,9 +11,9 @@
 #include <linux/memory.h>
 #include <linux/gfp.h>
 #include <linux/dmapool.h>
-#include <mach/coh901318.h>
+#include <linux/dmaengine.h>
 
-#include "coh901318_lli.h"
+#include "coh901318.h"
 
 #if (defined(CONFIG_DEBUG_FS) && defined(CONFIG_U300_DEBUG))
 #define DEBUGFS_POOL_COUNTER_RESET(pool) (pool->debugfs_pool_counter = 0)
@@ -61,7 +61,7 @@ coh901318_lli_alloc(struct coh901318_pool *pool, unsigned int len)
        dma_addr_t phy;
 
        if (len == 0)
-               goto err;
+               return NULL;
 
        spin_lock(&pool->lock);