linux-kernel - [PATCH] base: dma-coherent: fix device

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1413405140-17777-1-git-send-email-balbi@ti.com>
Date:	Wed, 15 Oct 2014 15:32:20 -0500
From:	Felipe Balbi <balbi@...com>
To:	Greg KH <gregkh@...uxfoundation.org>
CC:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Felipe Balbi <balbi@...com>,
	Marek Szyprowski <m.szyprowski@...sung.com>,
	Arnd Bergmann <arnd@...db.de>,
	Michal Nazarewicz <mina86@...a86.com>,
	Grant Likely <grant.likely@...aro.org>,
	Laura Abbott <lauraa@...eaurora.org>,
	Josh Cartwright <joshc@...eaurora.org>,
	Joonsoo Kim <iamjoonsoo.kim@....com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH] base: dma-coherent: fix device_init initialization

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@...sung.com>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Michal Nazarewicz <mina86@...a86.com>
Cc: Grant Likely <grant.likely@...aro.org>
Cc: Laura Abbott <lauraa@...eaurora.org>
Cc: Josh Cartwright <joshc@...eaurora.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@....com>
Cc: Kyungmin Park <kyungmin.park@...sung.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Fixes: 7bfa5ab6 (drivers: dma-coherent: add initialization
	from device tree)
Signed-off-by: Felipe Balbi <balbi@...com>
---
 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,
-- 
2.1.0.GIT

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