staging: android/ion: Fix coding style issues
PATCH 1/1 staging: android/ion: Fix coding style issues
Fix following checkpatch warnings:
- Lines over 80 characters
- void function with return statement
- Unaligned comment mark
- Header function prototypes missing variable names
Sent against staging-next.
--- drivers/staging/android/ion/ion-ioctl.c | 3 ++- drivers/staging/android/ion/ion_of.c | 1 - drivers/staging/android/ion/ion_priv.h | 40 ++++++++++++++++----------------- 3 files changed, 22 insertions(+), 22 deletions(-)
drivers/staging/android/ion/ion-ioctl.c +2 -1
@@ -111,7 +111,8 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)struct ion_handle *handle;mutex_lock (&client->lock); - handle =ion_handle_get_by_id_nolock (client, data.handle.handle); + handle =ion_handle_get_by_id_nolock (client, + data.handle.handle);if (IS_ERR (handle)) {mutex_unlock (&client->lock);return PTR_ERR (handle);
drivers/staging/android/ion/ion_of.c +0 -1
@@ -161,7 +161,6 @@ static int rmem_ion_device_init(struct reserved_mem *rmem, struct device *dev)static void rmem_ion_device_release (struct reserved_mem *rmem,struct device *dev) { -return ; }static const struct reserved_mem_ops rmem_dma_ops = {
drivers/staging/android/ion/ion_priv.h +17 -17
@@ -54,7 +54,7 @@* handle, used for debugging * @pid: pid of last client to reference this buffer in a * handle, used for debugging -*/ +*/ struct ion_buffer {struct kref ref;union {
@@ -287,10 +287,10 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap); * some helpers for common operations on buffers using the sg_table -void *ion_heap_map_kernel (struct ion_heap *,struct ion_buffer *); -void ion_heap_unmap_kernel (struct ion_heap *,struct ion_buffer *); -int ion_heap_map_user (struct ion_heap *,struct ion_buffer *, -struct vm_area_struct *); +void *ion_heap_map_kernel (struct ion_heap *heap,struct ion_buffer *buffer); +void ion_heap_unmap_kernel (struct ion_heap *heap,struct ion_buffer *buffer); +int ion_heap_map_user (struct ion_heap *heap,struct ion_buffer *buffer, +struct vm_area_struct *vma);int ion_heap_buffer_zero (struct ion_buffer *buffer);int ion_heap_pages_zero (struct page *page,size_t size,pgprot_t pgprot);
@@ -371,21 +371,21 @@ size_t ion_heap_freelist_size(struct ion_heap *heap);* heaps as appropriate. */ -struct ion_heap *ion_heap_create (struct ion_platform_heap *); -void ion_heap_destroy (struct ion_heap *); -struct ion_heap *ion_system_heap_create (struct ion_platform_heap *); -void ion_system_heap_destroy (struct ion_heap *); +struct ion_heap *ion_heap_create (struct ion_platform_heap *heap_data); +void ion_heap_destroy (struct ion_heap *heap); +struct ion_heap *ion_system_heap_create (struct ion_platform_heap *unused); +void ion_system_heap_destroy (struct ion_heap *heap); -struct ion_heap *ion_system_contig_heap_create (struct ion_platform_heap *); -void ion_system_contig_heap_destroy (struct ion_heap *); +struct ion_heap *ion_system_contig_heap_create (struct ion_platform_heap *heap); +void ion_system_contig_heap_destroy (struct ion_heap *heap); -struct ion_heap *ion_carveout_heap_create (struct ion_platform_heap *); -void ion_carveout_heap_destroy (struct ion_heap *); +struct ion_heap *ion_carveout_heap_create (struct ion_platform_heap *heap_data); +void ion_carveout_heap_destroy (struct ion_heap *heap); -struct ion_heap *ion_chunk_heap_create (struct ion_platform_heap *); -void ion_chunk_heap_destroy (struct ion_heap *); -struct ion_heap *ion_cma_heap_create (struct ion_platform_heap *); -void ion_cma_heap_destroy (struct ion_heap *); +struct ion_heap *ion_chunk_heap_create (struct ion_platform_heap *heap_data); +void ion_chunk_heap_destroy (struct ion_heap *heap); +struct ion_heap *ion_cma_heap_create (struct ion_platform_heap *data); +void ion_cma_heap_destroy (struct ion_heap *heap);/** * functions for creating and destroying a heap pool -- allows you
@@ -427,9 +427,9 @@ struct ion_page_pool { struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned
int order,
bool cached);
-void ion_page_pool_destroy(struct ion_page_pool *);
-struct page *ion_page_pool_alloc(struct ion_page_pool *); -void ion_page_pool_free(struct ion_page_pool *, struct page *); +void ion_page_pool_destroy(struct ion_page_pool *pool); +struct page *ion_page_pool_alloc(struct ion_page_pool *pool); +void ion_page_pool_free(struct ion_page_pool *pool, struct page *page);
/** ion_page_pool_shrink - shrinks the size of the memory cached in
the pool
* @pool: the pool
Signature · 1 line
2.10.0
Greg KH
maintainerQuoted 6 lines · Bogdan Purcareata
Fix following checkpatch warnings:
- Lines over 80 characters
- void function with return statement
- Unaligned comment mark
- Header function prototypes missing variable names
Quoted 8 lines
Sent against staging-next.
Signed-off-by Bogdan Purcareata <[email protected]>--- drivers/staging/android/ion/ion-ioctl.c | 3 ++- drivers/staging/android/ion/ion_of.c | 1 - drivers/staging/android/ion/ion_priv.h | 40++++++++++++++++-----------------
Your patch is line-wrapped and can't be applied :(
Quoted 5 lines · Bogdan Purcareata
Fix following checkpatch warnings:
- Lines over 80 characters
- void function with return statement
- Unaligned comment mark
- Header function prototypes missing variable names
Please read Documentation/SubmittingPatches
(umm, make that Documentation/process/submitting-patches.rst)
Make sure to send the patch to yourself only until you know you can apply it correctly and then send it to the mailing list.
btw:
This should probably be a series of 4 patches, each single patch doing one of the things listed above.
And do please use checkpatch on your proposed patches.