lkml.org 
[lkml]   [2013]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 092/115] ion: don't use __arm_ioremap to map pages
    Date
    From: Colin Cross <ccross@android.com>

    ion_heap_map_kernel already implements mapping a scatterlist of
    pages into the kernel, and all heaps are required to have struct
    pages associated with them, so delete the functions that use
    __arm_ioremap and use ion_heap_map_kernel instead.

    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    ---
    drivers/staging/android/ion/ion_carveout_heap.c | 42 ++-----------------------
    drivers/staging/android/ion/ion_chunk_heap.c | 2 --
    2 files changed, 3 insertions(+), 41 deletions(-)

    diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
    index 36df34c..051363a 100644
    --- a/drivers/staging/android/ion/ion_carveout_heap.c
    +++ b/drivers/staging/android/ion/ion_carveout_heap.c
    @@ -25,8 +25,6 @@
    #include "ion.h"
    #include "ion_priv.h"

    -#include <asm/mach/map.h>
    -
    struct ion_carveout_heap {
    struct ion_heap heap;
    struct gen_pool *pool;
    @@ -109,49 +107,15 @@ void ion_carveout_heap_unmap_dma(struct ion_heap *heap,
    sg_free_table(buffer->sg_table);
    }

    -void *ion_carveout_heap_map_kernel(struct ion_heap *heap,
    - struct ion_buffer *buffer)
    -{
    - void *ret;
    - int mtype = MT_MEMORY_NONCACHED;
    -
    - if (buffer->flags & ION_FLAG_CACHED)
    - mtype = MT_MEMORY;
    -
    - ret = __arm_ioremap(buffer->priv_phys, buffer->size,
    - mtype);
    - if (ret == NULL)
    - return ERR_PTR(-ENOMEM);
    -
    - return ret;
    -}
    -
    -void ion_carveout_heap_unmap_kernel(struct ion_heap *heap,
    - struct ion_buffer *buffer)
    -{
    - __arm_iounmap(buffer->vaddr);
    - buffer->vaddr = NULL;
    - return;
    -}
    -
    -int ion_carveout_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer,
    - struct vm_area_struct *vma)
    -{
    - return remap_pfn_range(vma, vma->vm_start,
    - __phys_to_pfn(buffer->priv_phys) + vma->vm_pgoff,
    - vma->vm_end - vma->vm_start,
    - pgprot_noncached(vma->vm_page_prot));
    -}
    -
    static struct ion_heap_ops carveout_heap_ops = {
    .allocate = ion_carveout_heap_allocate,
    .free = ion_carveout_heap_free,
    .phys = ion_carveout_heap_phys,
    .map_dma = ion_carveout_heap_map_dma,
    .unmap_dma = ion_carveout_heap_unmap_dma,
    - .map_user = ion_carveout_heap_map_user,
    - .map_kernel = ion_carveout_heap_map_kernel,
    - .unmap_kernel = ion_carveout_heap_unmap_kernel,
    + .map_user = ion_heap_map_user,
    + .map_kernel = ion_heap_map_kernel,
    + .unmap_kernel = ion_heap_unmap_kernel,
    };

    struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data)
    diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
    index 62f7439..d3363d6 100644
    --- a/drivers/staging/android/ion/ion_chunk_heap.c
    +++ b/drivers/staging/android/ion/ion_chunk_heap.c
    @@ -25,8 +25,6 @@
    #include "ion.h"
    #include "ion_priv.h"

    -#include <asm/mach/map.h>
    -
    struct ion_chunk_heap {
    struct ion_heap heap;
    struct gen_pool *pool;
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-14 00:01    [W:4.050 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site