gpu: ion: Fixup merge conflicts and old code
During the course of merging patches, some of the merge conflict
fixups have resulted in minor differences from the upstream
tree. Additionally, some old code from removed features is
still present. Fixup those differences to avoid merge conflicts
and remove old code that isn't needed anymore.
Change-Id: I593162ca0b3482ad338173401a02cc03f94f9213
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
diff --git a/drivers/gpu/ion/ion_system_heap.c b/drivers/gpu/ion/ion_system_heap.c
index f9d9040..fb6dc2d 100644
--- a/drivers/gpu/ion/ion_system_heap.c
+++ b/drivers/gpu/ion/ion_system_heap.c
@@ -26,9 +26,6 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include "ion_priv.h"
-#include <mach/memory.h>
-#include <asm/cacheflush.h>
-#include <linux/msm_ion.h>
#include <linux/dma-mapping.h>
#include <trace/events/kmem.h>
@@ -285,7 +282,7 @@
return 0;
}
-struct ion_heap *ion_system_heap_create(struct ion_platform_heap *pheap)
+struct ion_heap *ion_system_heap_create(struct ion_platform_heap *unused)
{
struct ion_system_heap *heap;
int i;
@@ -399,7 +396,7 @@
.map_user = ion_heap_map_user,
};
-struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *pheap)
+struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *unused)
{
struct ion_heap *heap;