[PATCH] base: dma-coherent: fix device_init initialization

From: Felipe Balbi
Date: Wed Oct 15 2014 - 16:32:59 EST

commit 7bfa5ab (drivers: dma-coherent: add initialization
from device tree) added support for dma coherent pool for
DeviceTree. Unfortunately that commit introduced a new
build warning because of a wrong type on the definition
of ->device_init(). This patch fixes it.

Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Michal Nazarewicz <mina86@xxxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxx>
Cc: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
Cc: Josh Cartwright <joshc@xxxxxxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Fixes: 7bfa5ab6 (drivers: dma-coherent: add initialization
from device tree)
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
drivers/base/dma-coherent.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index 55b8398..d3695a8 100644
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -276,7 +276,7 @@ EXPORT_SYMBOL(dma_mmap_from_coherent);
#include <linux/of_fdt.h>
#include <linux/of_reserved_mem.h>

-static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
+static void rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
struct dma_coherent_mem *mem = rmem->priv;

@@ -286,11 +286,10 @@ static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
&mem) != DMA_MEMORY_MAP) {
pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
&rmem->base, (unsigned long)rmem->size / SZ_1M);
- return -ENODEV;
+ return;
rmem->priv = mem;
dma_assign_coherent_memory(dev, mem);
- return 0;

static void rmem_dma_device_release(struct reserved_mem *rmem,

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/