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 <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index b3395924f03e45a280082063d1dd2b74f6425f3e..14cb6c6cb10635e0c573d712f46d6a74bb5bcd24 100644 (file)
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -56,8 +56,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;
 };
@@ -430,7 +430,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)
@@ -1526,8 +1526,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;
                        }

diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h
index fc2e4fccf69d216d60761e67775df69f6fd5ea45..0942a7fc82b4460ea82fa42d201d0831e32c3f52 100644 (file)
--- a/drivers/staging/android/ion/ion_priv.h
+++ b/drivers/staging/android/ion/ion_priv.h
@@ -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.
  */
 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);
 };
 
 /**