gpu: ion: remove unnecessary function from system heap
authorColin Cross <ccross@android.com>
Sat, 14 Dec 2013 03:26:15 +0000 (19:26 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2013 16:57:19 +0000 (08:57 -0800)
ion_system_contig_heap buffers have an sglist, just call
ion_heap_map_user to map it.

Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/ion/ion_system_heap.c

index 3b2f420b945dbea31fc1e4f697525c5b38eec0e5..9250ee51171dbcccb9033fc8449d080045857860 100644 (file)
@@ -422,17 +422,6 @@ void ion_system_contig_heap_unmap_dma(struct ion_heap *heap,
        kfree(buffer->sg_table);
 }
 
-int ion_system_contig_heap_map_user(struct ion_heap *heap,
-                                   struct ion_buffer *buffer,
-                                   struct vm_area_struct *vma)
-{
-       unsigned long pfn = page_to_pfn(virt_to_page(buffer->priv_virt));
-       return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff,
-                              vma->vm_end - vma->vm_start,
-                              vma->vm_page_prot);
-
-}
-
 static struct ion_heap_ops kmalloc_ops = {
        .allocate = ion_system_contig_heap_allocate,
        .free = ion_system_contig_heap_free,
@@ -441,7 +430,7 @@ static struct ion_heap_ops kmalloc_ops = {
        .unmap_dma = ion_system_contig_heap_unmap_dma,
        .map_kernel = ion_heap_map_kernel,
        .unmap_kernel = ion_heap_unmap_kernel,
-       .map_user = ion_system_contig_heap_map_user,
+       .map_user = ion_heap_map_user,
 };
 
 struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *unused)