From: Huang, Tao <huangtao@rock-chips.com>
Date: Fri, 26 Dec 2014 14:26:14 +0000 (+0800)
Subject: Revert "rk: ion: fix dts parse failure on arm64"
X-Git-Tag: firefly_0821_release~4158^2~480
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=50883470a5b50c8c8136f40647ba1039143f3f50;p=firefly-linux-kernel-4.4.55.git

Revert "rk: ion: fix dts parse failure on arm64"

This reverts commit e46863d23c4753b4f523dcdde0a907c06df40494.
---

diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c
index 11f07444c87b..a758a17d3e4b 100755
--- a/drivers/staging/android/ion/rockchip/rockchip_ion.c
+++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c
@@ -274,7 +274,7 @@ int __init rockchip_ion_find_heap(unsigned long node, const char *uname,
 		return 0;
 
 	prop = of_get_flat_dt_prop(node, "rockchip,ion_heap", &len);
-	if (!prop || (len != sizeof(__be32)))
+	if (!prop || (len != sizeof(unsigned long)))
 		return 0;
 
 	heap = &pdata->heaps[pdata->nr++];
@@ -283,10 +283,10 @@ int __init rockchip_ion_find_heap(unsigned long node, const char *uname,
 	rockchip_ion_populate_heap(heap);
 
 	prop = of_get_flat_dt_prop(node, "reg", &len);
-	if (prop && (len >= 2*sizeof(__be32))) {
+	if (prop && (len >= 2*sizeof(unsigned long))) {
 		heap->base = be32_to_cpu(prop[0]);
 		heap->size = be32_to_cpu(prop[1]);
-		if (len==3*sizeof(__be32))
+		if (len==3*sizeof(unsigned long))
 			heap->align = be32_to_cpu(prop[2]);
 	}