From: CMY <cmy@rock-chips.com>
Date: Thu, 13 Mar 2014 11:51:59 +0000 (+0800)
Subject: rk: ion: resive build error if CONFIG_CMA is disable
X-Git-Tag: firefly_0821_release~6101
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a4fb00aeb702c116dadf4e800caf3cd1bbf14e7a;p=firefly-linux-kernel-4.4.55.git

rk: ion: resive build error if CONFIG_CMA is disable
---

diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c
index ae61fb5154de..48c76eef0e87 100755
--- a/drivers/staging/android/ion/rockchip/rockchip_ion.c
+++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c
@@ -164,6 +164,8 @@ free_heaps:
 	return ERR_PTR(ret);
 }
 
+#ifdef CONFIG_CMA
+
 // struct "cma" quoted from drivers/base/dma-contiguous.c
 struct cma {
 	unsigned long	base_pfn;
@@ -209,6 +211,8 @@ static int ion_cma_heap_debug_show(struct ion_heap *heap, struct seq_file *s,
 	return 0;
 }
 
+#endif
+
 struct ion_client *rockchip_ion_client_create(const char *name)
 {
 	return ion_client_create(idev, name);
@@ -331,8 +335,10 @@ static int rockchip_ion_probe(struct platform_device *pdev)
 			err = PTR_ERR(heaps[i]);
 			goto err;
 		}
+#ifdef CONFIG_CMA
 		if (ION_HEAP_TYPE_DMA==heap_data->type)
 			heaps[i]->debug_show = ion_cma_heap_debug_show;
+#endif
 		ion_device_add_heap(idev, heaps[i]);
 	}
 	platform_set_drvdata(pdev, idev);
@@ -367,6 +373,7 @@ static int rockchip_ion_remove(struct platform_device *pdev)
 int __init rockchip_ion_find_reserve_mem(unsigned long node, const char *uname,
 				int depth, void *data)
 {
+#ifdef CONFIG_CMA
 	__be32 *prop;
 	unsigned long len;
 	phys_addr_t size;
@@ -385,6 +392,7 @@ int __init rockchip_ion_find_reserve_mem(unsigned long node, const char *uname,
 	pr_info("%s: reserve cma memory: %x %x\n", __func__, base, size);
 
 	dma_declare_contiguous(&rockchip_ion_cma_dev, size, base, 0);
+#endif
 
 	return 1;
 }