Commit 679011bd authored by Ben LeMasurier's avatar Ben LeMasurier Committed by Greg Kroah-Hartman

Staging: android: ion: fix parenthesis alignment

This fixes remaining checkpatch.pl "Alignment should match open
parenthesis" issues.
Signed-off-by: default avatarBen LeMasurier <ben@crypt.ly>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 121ca0c6
...@@ -34,9 +34,9 @@ struct ion_chunk_heap { ...@@ -34,9 +34,9 @@ struct ion_chunk_heap {
}; };
static int ion_chunk_heap_allocate(struct ion_heap *heap, static int ion_chunk_heap_allocate(struct ion_heap *heap,
struct ion_buffer *buffer, struct ion_buffer *buffer,
unsigned long size, unsigned long align, unsigned long size, unsigned long align,
unsigned long flags) unsigned long flags)
{ {
struct ion_chunk_heap *chunk_heap = struct ion_chunk_heap *chunk_heap =
container_of(heap, struct ion_chunk_heap, heap); container_of(heap, struct ion_chunk_heap, heap);
...@@ -71,7 +71,7 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap, ...@@ -71,7 +71,7 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap,
if (!paddr) if (!paddr)
goto err; goto err;
sg_set_page(sg, pfn_to_page(PFN_DOWN(paddr)), sg_set_page(sg, pfn_to_page(PFN_DOWN(paddr)),
chunk_heap->chunk_size, 0); chunk_heap->chunk_size, 0);
sg = sg_next(sg); sg = sg_next(sg);
} }
...@@ -106,7 +106,7 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer) ...@@ -106,7 +106,7 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer)
if (ion_buffer_cached(buffer)) if (ion_buffer_cached(buffer))
dma_sync_sg_for_device(NULL, table->sgl, table->nents, dma_sync_sg_for_device(NULL, table->sgl, table->nents,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
for_each_sg(table->sgl, sg, table->nents, i) { for_each_sg(table->sgl, sg, table->nents, i) {
gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)), 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) ...@@ -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.type = ION_HEAP_TYPE_CHUNK;
chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;
pr_debug("%s: base %lu size %zu align %ld\n", __func__, 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; return &chunk_heap->heap;
......
...@@ -126,7 +126,7 @@ static void *ion_cma_map_kernel(struct ion_heap *heap, ...@@ -126,7 +126,7 @@ static void *ion_cma_map_kernel(struct ion_heap *heap,
} }
static void ion_cma_unmap_kernel(struct ion_heap *heap, static void ion_cma_unmap_kernel(struct ion_heap *heap,
struct ion_buffer *buffer) struct ion_buffer *buffer)
{ {
} }
......
...@@ -99,7 +99,7 @@ static int __init ion_dummy_init(void) ...@@ -99,7 +99,7 @@ static int __init ion_dummy_init(void)
struct ion_platform_heap *heap_data = &dummy_ion_pdata.heaps[i]; struct ion_platform_heap *heap_data = &dummy_ion_pdata.heaps[i];
if (heap_data->type == ION_HEAP_TYPE_CARVEOUT && if (heap_data->type == ION_HEAP_TYPE_CARVEOUT &&
!heap_data->base) !heap_data->base)
continue; continue;
if (heap_data->type == ION_HEAP_TYPE_CHUNK && !heap_data->base) if (heap_data->type == ION_HEAP_TYPE_CHUNK && !heap_data->base)
...@@ -120,12 +120,12 @@ static int __init ion_dummy_init(void) ...@@ -120,12 +120,12 @@ static int __init ion_dummy_init(void)
if (carveout_ptr) { if (carveout_ptr) {
free_pages_exact(carveout_ptr, free_pages_exact(carveout_ptr,
dummy_heaps[ION_HEAP_TYPE_CARVEOUT].size); dummy_heaps[ION_HEAP_TYPE_CARVEOUT].size);
carveout_ptr = NULL; carveout_ptr = NULL;
} }
if (chunk_ptr) { if (chunk_ptr) {
free_pages_exact(chunk_ptr, free_pages_exact(chunk_ptr,
dummy_heaps[ION_HEAP_TYPE_CHUNK].size); dummy_heaps[ION_HEAP_TYPE_CHUNK].size);
chunk_ptr = NULL; chunk_ptr = NULL;
} }
return err; return err;
...@@ -144,12 +144,12 @@ static void __exit ion_dummy_exit(void) ...@@ -144,12 +144,12 @@ static void __exit ion_dummy_exit(void)
if (carveout_ptr) { if (carveout_ptr) {
free_pages_exact(carveout_ptr, free_pages_exact(carveout_ptr,
dummy_heaps[ION_HEAP_TYPE_CARVEOUT].size); dummy_heaps[ION_HEAP_TYPE_CARVEOUT].size);
carveout_ptr = NULL; carveout_ptr = NULL;
} }
if (chunk_ptr) { if (chunk_ptr) {
free_pages_exact(chunk_ptr, free_pages_exact(chunk_ptr,
dummy_heaps[ION_HEAP_TYPE_CHUNK].size); dummy_heaps[ION_HEAP_TYPE_CHUNK].size);
chunk_ptr = NULL; chunk_ptr = NULL;
} }
} }
......
...@@ -115,7 +115,7 @@ static int ion_page_pool_total(struct ion_page_pool *pool, bool high) ...@@ -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 ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask,
int nr_to_scan) int nr_to_scan)
{ {
int freed = 0; int freed = 0;
bool high; bool high;
......
...@@ -128,9 +128,9 @@ static struct page *alloc_largest_available(struct ion_system_heap *heap, ...@@ -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, static int ion_system_heap_allocate(struct ion_heap *heap,
struct ion_buffer *buffer, struct ion_buffer *buffer,
unsigned long size, unsigned long align, unsigned long size, unsigned long align,
unsigned long flags) unsigned long flags)
{ {
struct ion_system_heap *sys_heap = container_of(heap, struct ion_system_heap *sys_heap = container_of(heap,
struct ion_system_heap, struct ion_system_heap,
...@@ -152,7 +152,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap, ...@@ -152,7 +152,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap,
INIT_LIST_HEAD(&pages); INIT_LIST_HEAD(&pages);
while (size_remaining > 0) { while (size_remaining > 0) {
page = alloc_largest_available(sys_heap, buffer, size_remaining, page = alloc_largest_available(sys_heap, buffer, size_remaining,
max_order); max_order);
if (!page) if (!page)
goto free_pages; goto free_pages;
list_add_tail(&page->lru, &pages); list_add_tail(&page->lru, &pages);
...@@ -205,7 +205,7 @@ static void ion_system_heap_free(struct ion_buffer *buffer) ...@@ -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, 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 *uncached_pool;
struct ion_page_pool *cached_pool; struct ion_page_pool *cached_pool;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment