staging: android: ion: Fixup some white-space issues

Add white-space for easier reading and remove some where it does
not belong. No functional changes, they just bug me..

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index 891f5703220bc6872bd70dc02cdba399785f784a..be80671df9c8a276eb916020f9df291927ed11e3 100644 (file)
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -44,6 +44,7 @@ static void ion_carveout_free(struct ion_heap *heap, phys_addr_t addr,
 
        if (addr == ION_CARVEOUT_ALLOCATE_FAIL)
                return;
+
        gen_pool_free(carveout_heap->pool, addr, size);
 }
 

diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index c2321a047f0fc16597dda3488dfa6a292e461e5a..b82eac1c2d7a0e644d01e39aeff75682d759710a 100644 (file)
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -4,6 +4,7 @@
  *
  * Copyright (C) 2012 Google, Inc.
  */
+
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/genalloc.h>
@@ -147,4 +148,3 @@ error_gen_pool_create:
        kfree(chunk_heap);
        return ERR_PTR(ret);
 }
-

diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
index 6ee0ac6e4be443a91d8b23fb95f61bffc764a0b9..473b465724f183b9226af0221016bd269677911c 100644 (file)
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -14,6 +14,7 @@
 #include <uapi/linux/sched/types.h>
 #include <linux/scatterlist.h>
 #include <linux/vmalloc.h>
+
 #include "ion.h"
 
 void *ion_heap_map_kernel(struct ion_heap *heap,
@@ -92,6 +93,7 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer,
                if (addr >= vma->vm_end)
                        return 0;
        }
+
        return 0;
 }
 
@@ -254,6 +256,7 @@ int ion_heap_init_deferred_free(struct ion_heap *heap)
                return PTR_ERR_OR_ZERO(heap->task);
        }
        sched_setscheduler(heap->task, SCHED_IDLE, &param);
+
        return 0;
 }
 
@@ -265,8 +268,10 @@ static unsigned long ion_heap_shrink_count(struct shrinker *shrinker,
        int total = 0;
 
        total = ion_heap_freelist_size(heap) / PAGE_SIZE;
+
        if (heap->ops->shrink)
                total += heap->ops->shrink(heap, sc->gfp_mask, 0);
+
        return total;
 }
 
@@ -295,6 +300,7 @@ static unsigned long ion_heap_shrink_scan(struct shrinker *shrinker,
 
        if (heap->ops->shrink)
                freed += heap->ops->shrink(heap, sc->gfp_mask, to_scan);
+
        return freed;
 }
 

diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 643b32099488250af395a67f34578e48c85eff5e..ec526a464db8e1ffaf4041a867a57e460e0714fa 100644 (file)
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -13,6 +13,7 @@
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+
 #include "ion.h"
 
 #define NUM_ORDERS ARRAY_SIZE(orders)
@@ -236,6 +237,7 @@ static int ion_system_heap_create_pools(struct ion_page_pool **pools)
                        goto err_create_pool;
                pools[i] = pool;
        }
+
        return 0;
 
 err_create_pool:
@@ -274,6 +276,7 @@ static int ion_system_heap_create(void)
        heap->name = "ion_system_heap";
 
        ion_device_add_heap(heap);
+
        return 0;
 }
 device_initcall(ion_system_heap_create);
@@ -355,6 +358,7 @@ static struct ion_heap *__ion_system_contig_heap_create(void)
        heap->ops = &kmalloc_ops;
        heap->type = ION_HEAP_TYPE_SYSTEM_CONTIG;
        heap->name = "ion_system_contig_heap";
+
        return heap;
 }
 
@@ -367,7 +371,7 @@ static int ion_system_contig_heap_create(void)
                return PTR_ERR(heap);
 
        ion_device_add_heap(heap);
+
        return 0;
 }
 device_initcall(ion_system_contig_heap_create);
-