staging: android: ion: Get rid of ion_phys_addr_t

Once upon a time, phys_addr_t was not everywhere in the kernel. These
days it is used enough places that having a separate Ion type doesn't
make sense. Remove the extra type and just use phys_addr_t directly.

Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h
index 3b4bff5c09121daa21bce10a6f7663b408bd0262..e8a6ffed06ee6c39b9cafa9f0186b8825afd7efb 100644 (file)
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -28,14 +28,6 @@ struct ion_mapper;
 struct ion_client;
 struct ion_buffer;
 
-/*
- * This should be removed some day when phys_addr_t's are fully
- * plumbed in the kernel, and all instances of ion_phys_addr_t should
- * be converted to phys_addr_t.  For the time being many kernel interfaces
- * do not accept phys_addr_t's that would have to
- */
-#define ion_phys_addr_t unsigned long
-
 /**
  * struct ion_platform_heap - defines a heap in the given platform
  * @type:      type of the heap from ion_heap_type enum
@@ -53,9 +45,9 @@ struct ion_platform_heap {
        enum ion_heap_type type;
        unsigned int id;
        const char *name;
-       ion_phys_addr_t base;
+       phys_addr_t base;
        size_t size;
-       ion_phys_addr_t align;
+       phys_addr_t align;
        void *priv;
 };
 

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index e0e360f12776c500ec6985b211d987914a82eba6..1419a8993bf1481c5aa33e27299bbf7064837c01 100644 (file)
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -30,10 +30,10 @@
 struct ion_carveout_heap {
        struct ion_heap heap;
        struct gen_pool *pool;
-       ion_phys_addr_t base;
+       phys_addr_t base;
 };
 
-static ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
+static phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
                                             unsigned long size)
 {
        struct ion_carveout_heap *carveout_heap =
@@ -46,7 +46,7 @@ static ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
        return offset;
 }
 
-static void ion_carveout_free(struct ion_heap *heap, ion_phys_addr_t addr,
+static void ion_carveout_free(struct ion_heap *heap, phys_addr_t addr,
                              unsigned long size)
 {
        struct ion_carveout_heap *carveout_heap =
@@ -63,7 +63,7 @@ static int ion_carveout_heap_allocate(struct ion_heap *heap,
                                      unsigned long flags)
 {
        struct sg_table *table;
-       ion_phys_addr_t paddr;
+       phys_addr_t paddr;
        int ret;
 
        table = kmalloc(sizeof(*table), GFP_KERNEL);
@@ -96,7 +96,7 @@ static void ion_carveout_heap_free(struct ion_buffer *buffer)
        struct ion_heap *heap = buffer->heap;
        struct sg_table *table = buffer->sg_table;
        struct page *page = sg_page(table->sgl);
-       ion_phys_addr_t paddr = PFN_PHYS(page_to_pfn(page));
+       phys_addr_t paddr = PFN_PHYS(page_to_pfn(page));
 
        ion_heap_buffer_zero(buffer);
 

diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index 46e13f604e22b20c5c27d3c6046bf5a198673a93..606f25fc369c585c5b744d8697848c22a761fdda 100644 (file)
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -27,7 +27,7 @@
 struct ion_chunk_heap {
        struct ion_heap heap;
        struct gen_pool *pool;
-       ion_phys_addr_t base;
+       phys_addr_t base;
        unsigned long chunk_size;
        unsigned long size;
        unsigned long allocated;
@@ -151,8 +151,8 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data)
        chunk_heap->heap.ops = &chunk_heap_ops;
        chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK;
        chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;
-       pr_debug("%s: base %lu size %zu \n", __func__,
-                chunk_heap->base, heap_data->size);
+       pr_debug("%s: base %pa size %zu \n", __func__,
+                &chunk_heap->base, heap_data->size);
 
        return &chunk_heap->heap;
 

diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
index 66f8fc5c8ceed641c7419f5bd8ba8ca85d5f6a08..c974623bb28eb5808841a0273926fc97249e6bc5 100644 (file)
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -345,9 +345,9 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data)
        }
 
        if (IS_ERR_OR_NULL(heap)) {
-               pr_err("%s: error creating heap %s type %d base %lu size %zu\n",
+               pr_err("%s: error creating heap %s type %d base %pa size %zu\n",
                       __func__, heap_data->name, heap_data->type,
-                      heap_data->base, heap_data->size);
+                      &heap_data->base, heap_data->size);
                return ERR_PTR(-EINVAL);
        }