Commit 51108985 authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman

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: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a894c69b
...@@ -56,8 +56,8 @@ struct ion_device { ...@@ -56,8 +56,8 @@ struct ion_device {
struct mutex buffer_lock; struct mutex buffer_lock;
struct rw_semaphore lock; struct rw_semaphore lock;
struct plist_head heaps; struct plist_head heaps;
long (*custom_ioctl) (struct ion_client *client, unsigned int cmd, long (*custom_ioctl)(struct ion_client *client, unsigned int cmd,
unsigned long arg); unsigned long arg);
struct rb_root clients; struct rb_root clients;
struct dentry *debug_root; struct dentry *debug_root;
}; };
...@@ -430,7 +430,7 @@ static bool ion_handle_validate(struct ion_client *client, ...@@ -430,7 +430,7 @@ static bool ion_handle_validate(struct ion_client *client,
struct ion_handle *handle) struct ion_handle *handle)
{ {
WARN_ON(!mutex_is_locked(&client->lock)); 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) static int ion_handle_add(struct ion_client *client, struct ion_handle *handle)
...@@ -1526,8 +1526,7 @@ void __init ion_reserve(struct ion_platform_data *data) ...@@ -1526,8 +1526,7 @@ void __init ion_reserve(struct ion_platform_data *data)
data->heaps[i].align, data->heaps[i].align,
MEMBLOCK_ALLOC_ANYWHERE); MEMBLOCK_ALLOC_ANYWHERE);
if (!paddr) { if (!paddr) {
pr_err("%s: error allocating memblock for " pr_err("%s: error allocating memblock for heap %d\n",
"heap %d\n",
__func__, i); __func__, i);
continue; continue;
} }
......
...@@ -101,19 +101,19 @@ void ion_buffer_destroy(struct ion_buffer *buffer); ...@@ -101,19 +101,19 @@ void ion_buffer_destroy(struct ion_buffer *buffer);
* map_dma and map_kernel return pointer on success, ERR_PTR on error. * map_dma and map_kernel return pointer on success, ERR_PTR on error.
*/ */
struct ion_heap_ops { struct ion_heap_ops {
int (*allocate) (struct ion_heap *heap, int (*allocate)(struct ion_heap *heap,
struct ion_buffer *buffer, unsigned long len, struct ion_buffer *buffer, unsigned long len,
unsigned long align, unsigned long flags); unsigned long align, unsigned long flags);
void (*free) (struct ion_buffer *buffer); void (*free)(struct ion_buffer *buffer);
int (*phys) (struct ion_heap *heap, struct ion_buffer *buffer, int (*phys)(struct ion_heap *heap, struct ion_buffer *buffer,
ion_phys_addr_t *addr, size_t *len); ion_phys_addr_t *addr, size_t *len);
struct sg_table *(*map_dma) (struct ion_heap *heap, struct sg_table * (*map_dma)(struct ion_heap *heap,
struct ion_buffer *buffer); struct ion_buffer *buffer);
void (*unmap_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 * (*map_kernel)(struct ion_heap *heap, struct ion_buffer *buffer);
void (*unmap_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, int (*map_user)(struct ion_heap *mapper, struct ion_buffer *buffer,
struct vm_area_struct *vma); struct vm_area_struct *vma);
}; };
/** /**
......
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