staging : ion : Fix some checkpatch warnings and an error
PATCH v3 1/1 staging : ion : Fix some checkpatch warnings and an error
Quoted 1 line
From
5b07f49e38a55ccc2788c29b7e3852827298261aMon Sep 17 00:00:00 2001
From: Daeseok Youn <[email protected]>
Date: Mon, 10 Feb 2014 20:16:50 +0900
Subject: [PATCH] staging : ion : Fix some checkpatch warnings and an error
Warning:
- Unnecessary space after function pointer name
- quoted string split across lines
- fix alignment issues
Error:
- return is not a function, parentheses are not required
Signed-off-by Daeseok Youn <[email protected]>
--- drivers/staging/android/ion/ion.c | 9 ++++----- drivers/staging/android/ion/ion_priv.h | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 18 deletions(-)
drivers/staging/android/ion/ion.c +4 -5
@@ -55,8 +55,8 @@ struct ion_device {struct mutex buffer_lock;struct rw_semaphore lock;struct plist_head heaps; -long (*custom_ioctl) (struct ion_client *client,unsigned int cmd, -unsigned long arg); +long (*custom_ioctl)(struct ion_client *client,unsigned int cmd, +unsigned long arg);struct rb_root clients;struct dentry *debug_root; };
@@ -429,7 +429,7 @@ static bool ion_handle_validate(struct ion_client *client, struct ion_handle *handle) {WARN_ON (!mutex_is_locked (&client->lock)); -return (idr_find (&client->idr, handle->id) == handle); +return idr_find (&client->idr, handle->id) == handle; }static int ion_handle_add (struct ion_client *client,struct ion_handle *handle)
@@ -1527,8 +1527,7 @@ void __init ion_reserve(struct ion_platform_data *data) data->heaps[i].align, MEMBLOCK_ALLOC_ANYWHERE);if (!paddr) { -pr_err ("%s: error allocating memblock for " -"heap %d\n" , +pr_err ("%s: error allocating memblock for heap %d\n" , __func__, i);continue ; }
drivers/staging/android/ion/ion_priv.h +13 -13
@@ -100,19 +100,19 @@ void ion_buffer_destroy(struct ion_buffer *buffer);* map_dma and map_kernel return pointer on success, ERR_PTR on error. */ struct ion_heap_ops { -int (*allocate) (struct ion_heap *heap, -struct ion_buffer *buffer,unsigned long len, -unsigned long align,unsigned long flags); -void (*free) (struct ion_buffer *buffer); -int (*phys) (struct ion_heap *heap,struct ion_buffer *buffer, -ion_phys_addr_t *addr,size_t *len); -struct sg_table *(*map_dma) (struct ion_heap *heap, -struct ion_buffer *buffer); -void (*unmap_dma) (struct ion_heap *heap,struct ion_buffer *buffer); -void * (*map_kernel) (struct ion_heap *heap,struct ion_buffer *buffer); -void (*unmap_kernel) (struct ion_heap *heap,struct ion_buffer *buffer); -int (*map_user) (struct ion_heap *mapper,struct ion_buffer *buffer, -struct vm_area_struct *vma); +int (*allocate)(struct ion_heap *heap, +struct ion_buffer *buffer,unsigned long len, +unsigned long align,unsigned long flags); +void (*free)(struct ion_buffer *buffer); +int (*phys)(struct ion_heap *heap,struct ion_buffer *buffer, +ion_phys_addr_t *addr,size_t *len); +struct sg_table * (*map_dma)(struct ion_heap *heap, +struct ion_buffer *buffer); +void (*unmap_dma)(struct ion_heap *heap,struct ion_buffer *buffer); +void * (*map_kernel)(struct ion_heap *heap,struct ion_buffer *buffer); +void (*unmap_kernel)(struct ion_heap *heap,struct ion_buffer *buffer); +int (*map_user)(struct ion_heap *mapper,struct ion_buffer *buffer, +struct vm_area_struct *vma); };/**
Signature · 2 lines
1.7.9.5 ---