Staging: android: ion: fix parenthesis alignment

This fixes remaining checkpatch.pl "Alignment should match open
parenthesis" issues.

Signed-off-by: Ben LeMasurier <ben@crypt.ly>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index 560cf907aed5d7f7dd71ab69f37bd1ddc8cc81e7..70495dc645ea13b03d317b00d6110105e59fede0 100644 (file)
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -34,9 +34,9 @@ struct ion_chunk_heap {
 };
 
 static int ion_chunk_heap_allocate(struct ion_heap *heap,
-                                     struct ion_buffer *buffer,
-                                     unsigned long size, unsigned long align,
-                                     unsigned long flags)
+                                  struct ion_buffer *buffer,
+                                  unsigned long size, unsigned long align,
+                                  unsigned long flags)
 {
        struct ion_chunk_heap *chunk_heap =
                container_of(heap, struct ion_chunk_heap, heap);
@@ -71,7 +71,7 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap,
                if (!paddr)
                        goto err;
                sg_set_page(sg, pfn_to_page(PFN_DOWN(paddr)),
-                               chunk_heap->chunk_size, 0);
+                           chunk_heap->chunk_size, 0);
                sg = sg_next(sg);
        }
 
@@ -106,7 +106,7 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer)
 
        if (ion_buffer_cached(buffer))
                dma_sync_sg_for_device(NULL, table->sgl, table->nents,
-                                                       DMA_BIDIRECTIONAL);
+                                      DMA_BIDIRECTIONAL);
 
        for_each_sg(table->sgl, sg, table->nents, i) {
                gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
@@ -161,7 +161,7 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data)
        chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK;
        chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;
        pr_debug("%s: base %lu size %zu align %ld\n", __func__,
-               chunk_heap->base, heap_data->size, heap_data->align);
+                chunk_heap->base, heap_data->size, heap_data->align);
 
        return &chunk_heap->heap;
 

diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c
index d5ff3a282dfd8ed8c5327ff90501759e19ef0d2b..6c7de74bc7ab3d0d9911435a5d2c4986ab663af0 100644 (file)
--- a/drivers/staging/android/ion/ion_cma_heap.c
+++ b/drivers/staging/android/ion/ion_cma_heap.c
@@ -126,7 +126,7 @@ static void *ion_cma_map_kernel(struct ion_heap *heap,
 }
 
 static void ion_cma_unmap_kernel(struct ion_heap *heap,
-                                       struct ion_buffer *buffer)
+                                struct ion_buffer *buffer)
 {
 }
 

diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c
index 814a3c92a56ef5aa3095fc416b7fcc004105434f..b23f2c76c753e3fb95b191d98e9639a3294f5209 100644 (file)
--- a/drivers/staging/android/ion/ion_dummy_driver.c
+++ b/drivers/staging/android/ion/ion_dummy_driver.c
@@ -99,7 +99,7 @@ static int __init ion_dummy_init(void)
                struct ion_platform_heap *heap_data = &dummy_ion_pdata.heaps[i];
 
                if (heap_data->type == ION_HEAP_TYPE_CARVEOUT &&
-                                                       !heap_data->base)
+                   !heap_data->base)
                        continue;
 
                if (heap_data->type == ION_HEAP_TYPE_CHUNK && !heap_data->base)
@@ -120,12 +120,12 @@ err:
 
        if (carveout_ptr) {
                free_pages_exact(carveout_ptr,
-                               dummy_heaps[ION_HEAP_TYPE_CARVEOUT].size);
+                                dummy_heaps[ION_HEAP_TYPE_CARVEOUT].size);
                carveout_ptr = NULL;
        }
        if (chunk_ptr) {
                free_pages_exact(chunk_ptr,
-                               dummy_heaps[ION_HEAP_TYPE_CHUNK].size);
+                                dummy_heaps[ION_HEAP_TYPE_CHUNK].size);
                chunk_ptr = NULL;
        }
        return err;
@@ -144,12 +144,12 @@ static void __exit ion_dummy_exit(void)
 
        if (carveout_ptr) {
                free_pages_exact(carveout_ptr,
-                               dummy_heaps[ION_HEAP_TYPE_CARVEOUT].size);
+                                dummy_heaps[ION_HEAP_TYPE_CARVEOUT].size);
                carveout_ptr = NULL;
        }
        if (chunk_ptr) {
                free_pages_exact(chunk_ptr,
-                               dummy_heaps[ION_HEAP_TYPE_CHUNK].size);
+                                dummy_heaps[ION_HEAP_TYPE_CHUNK].size);
                chunk_ptr = NULL;
        }
 }

diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c
index 2c5e5c560b727f622e5977eca02190d1840393a7..aea89c1ec3451e0aace614a93fe2a7cecf928b87 100644 (file)
--- a/drivers/staging/android/ion/ion_page_pool.c
+++ b/drivers/staging/android/ion/ion_page_pool.c
@@ -115,7 +115,7 @@ static int ion_page_pool_total(struct ion_page_pool *pool, bool high)
 }
 
 int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask,
-                               int nr_to_scan)
+                        int nr_to_scan)
 {
        int freed = 0;
        bool high;

diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index f1cef2bebbc95a1cffc04b817077961dfb540b51..7e023d505af870ee527e8cce934e8155a7c193de 100644 (file)
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -128,9 +128,9 @@ static struct page *alloc_largest_available(struct ion_system_heap *heap,
 }
 
 static int ion_system_heap_allocate(struct ion_heap *heap,
-                                    struct ion_buffer *buffer,
-                                    unsigned long size, unsigned long align,
-                                    unsigned long flags)
+                                   struct ion_buffer *buffer,
+                                   unsigned long size, unsigned long align,
+                                   unsigned long flags)
 {
        struct ion_system_heap *sys_heap = container_of(heap,
                                                        struct ion_system_heap,
@@ -152,7 +152,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap,
        INIT_LIST_HEAD(&pages);
        while (size_remaining > 0) {
                page = alloc_largest_available(sys_heap, buffer, size_remaining,
-                                               max_order);
+                                              max_order);
                if (!page)
                        goto free_pages;
                list_add_tail(&page->lru, &pages);
@@ -205,7 +205,7 @@ static void ion_system_heap_free(struct ion_buffer *buffer)
 }
 
 static int ion_system_heap_shrink(struct ion_heap *heap, gfp_t gfp_mask,
-                                       int nr_to_scan)
+                                 int nr_to_scan)
 {
        struct ion_page_pool *uncached_pool;
        struct ion_page_pool *cached_pool;