From: Vladimir Murzin <vladimir.murzin@arm.com>
Date: Mon, 25 Sep 2017 09:25:53 +0000 (+0100)
Subject: ARM: 8697/1: dma-mapping: Do not pass data to gen_pool_set_algo()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=acb624488df3073be4e6f3c0a86b155c40d63ab2;p=openwrt%2Fstaging%2Fblogic.git

ARM: 8697/1: dma-mapping: Do not pass data to gen_pool_set_algo()

gen_pool_first_fit_order_align() does not make use of additional data,
so pass plain NULL there.

Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index fcf1473d6fed..785606e3783e 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -443,7 +443,7 @@ static int __init atomic_pool_init(void)
 
 		gen_pool_set_algo(atomic_pool,
 				gen_pool_first_fit_order_align,
-				(void *)PAGE_SHIFT);
+				NULL);
 		pr_info("DMA: preallocated %zu KiB pool for atomic coherent allocations\n",
 		       atomic_pool_size / 1024);
 		return 0;