Staging: android: ion: fix parenthesis alignment
PATCH v2 1/1 Staging: android: ion: fix parenthesis alignment
This fixes remaining checkpatch.pl "Alignment should match open parenthesis" issues.
Signed-off-by Ben LeMasurier <[email protected]>
---
V2: Rebased against current staging-testing staging tree.
drivers/staging/android/ion/ion.c | 42 +++++++++++++------------- drivers/staging/android/ion/ion_chunk_heap.c | 12 ++++---- drivers/staging/android/ion/ion_cma_heap.c | 2 +- drivers/staging/android/ion/ion_dummy_driver.c | 10 +++--- drivers/staging/android/ion/ion_page_pool.c | 2 +- drivers/staging/android/ion/ion_system_heap.c | 10 +++--- 6 files changed, 39 insertions(+), 39 deletions(-)
drivers/staging/android/ion/ion.c +21 -21
@@ -174,10 +174,10 @@ static void ion_buffer_add(struct ion_device *dev,/* this function should only be called while dev->lock is held */ static struct ion_buffer *ion_buffer_create (struct ion_heap *heap, -struct ion_device *dev, -unsigned long len, -unsigned long align, -unsigned long flags) +struct ion_device *dev, +unsigned long len, +unsigned long align, +unsigned long flags) {struct ion_buffer *buffer;struct sg_table *table;
@@ -331,7 +331,7 @@ static void ion_buffer_remove_from_handle(struct ion_buffer *buffer) }static struct ion_handle *ion_handle_create (struct ion_client *client, -struct ion_buffer *buffer) +struct ion_buffer *buffer) {struct ion_handle *handle;
@@ -421,7 +421,7 @@ static struct ion_handle *ion_handle_lookup(struct ion_client *client, }static struct ion_handle *ion_handle_get_by_id_nolock (struct ion_client *client, -int id) +int id) {struct ion_handle *handle;
@@ -581,7 +581,7 @@ static void *ion_buffer_kmap_get(struct ion_buffer *buffer) } vaddr = buffer->heap->ops->map_kernel (buffer->heap, buffer);if (WARN_ONCE (vaddr ==NULL , -"heap->ops->map_kernel should return ERR_PTR on error" )) +"heap->ops->map_kernel should return ERR_PTR on error" ))return ERR_PTR (-EINVAL );if (IS_ERR (vaddr))return vaddr;
@@ -750,7 +750,7 @@ static const struct file_operations debug_client_fops = { };static int ion_get_client_serial (const struct rb_root *root, -const unsigned char *name) +const unsigned char *name) {int serial =-1 ;struct rb_node *node;
@@ -839,7 +839,7 @@ struct ion_client *ion_client_create(struct ion_device *dev, path =dentry_path (dev->clients_debug_root, buf,256 );pr_err ("Failed to create client debugfs at %s/%s\n" , - path, client->display_name); + path, client->display_name); }up_write (&dev->lock);
@@ -907,7 +907,7 @@ static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, }void ion_pages_sync_for_device (struct device *dev,struct page *page, -size_t size,enum dma_data_direction dir) +size_t size,enum dma_data_direction dir) {struct scatterlist sg;
@@ -947,7 +947,7 @@ static void ion_buffer_sync_for_device(struct ion_buffer *buffer,if (ion_buffer_page_is_dirty (page))ion_pages_sync_for_device (dev,ion_buffer_page (page), -PAGE_SIZE , dir); +PAGE_SIZE , dir);ion_buffer_page_clean (buffer->pages + i); }
@@ -1025,7 +1025,7 @@ static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)if (!buffer->heap->ops->map_user) {pr_err ("%s: this heap does not define a method for mapping to userspace\n" , - __func__); + __func__);return -EINVAL ; }
@@ -1116,7 +1116,7 @@ static struct dma_buf_ops dma_buf_ops = { };struct dma_buf *ion_share_dma_buf (struct ion_client *client, -struct ion_handle *handle) +struct ion_handle *handle) {DEFINE_DMA_BUF_EXPORT_INFO (exp_info);struct ion_buffer *buffer;
@@ -1291,9 +1291,9 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)struct ion_handle *handle; handle =ion_alloc (client, data.allocation.len, - data.allocation.align, - data.allocation.heap_id_mask, - data.allocation.flags); + data.allocation.align, + data.allocation.heap_id_mask, + data.allocation.flags);if (IS_ERR (handle))return PTR_ERR (handle);
@@ -1478,7 +1478,7 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)seq_printf (s,"%16s %16zu\n" ,"total " , total_size);if (heap->flags &ION_HEAP_FLAG_DEFER_FREE )seq_printf (s,"%16s %16zu\n" ,"deferred free" , - heap->free_list_size); + heap->free_list_size);seq_puts (s,"----------------------------------------------------\n" );if (heap->debug_show)
@@ -1560,15 +1560,15 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap)plist_node_init (&heap->node, -heap->id);plist_add (&heap->node, &dev->heaps); debug_file =debugfs_create_file (heap->name,0664 , - dev->heaps_debug_root, heap, - &debug_heap_fops); + dev->heaps_debug_root, heap, + &debug_heap_fops);if (!debug_file) {char buf[256 ], *path; path =dentry_path (dev->heaps_debug_root, buf,256 );pr_err ("Failed to create heap debugfs at %s/%s\n" , - path, heap->name); + path, heap->name); }if (heap->shrinker.count_objects && heap->shrinker.scan_objects) {
@@ -1583,7 +1583,7 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap) path =dentry_path (dev->heaps_debug_root, buf,256 );pr_err ("Failed to create heap shrinker debugfs at %s/%s\n" , - path, debug_name); + path, debug_name); } }
drivers/staging/android/ion/ion_chunk_heap.c +6 -6
@@ -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;
drivers/staging/android/ion/ion_cma_heap.c +1 -1
@@ -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) { }
drivers/staging/android/ion/ion_dummy_driver.c +5 -5
@@ -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 ; } }
drivers/staging/android/ion/ion_page_pool.c +1 -1
@@ -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;
drivers/staging/android/ion/ion_system_heap.c +5 -5
@@ -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;
Signature · 1 line
2.9.3