staging: android: ion: ion_cma_heap.c: Fix checkpatch warning
authorPhong Tran <tranmanphong@gmail.com>
Sun, 20 Jul 2014 04:10:55 +0000 (11:10 +0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 19:26:55 +0000 (12:26 -0700)
This patch fix coding style:

- Remove "fail memory allocation" waring
- Remove return of void function

Tested by compilation only

Signed-off-by: Phong Tran <tranmanphong@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/ion/ion_cma_heap.c

index ce68ecfed31f863ac5acd25185b816a1f70212bb..f8cabcbc39e550beb91425d6611eaeefe9371b92 100644 (file)
@@ -76,10 +76,8 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
                return -EINVAL;
 
        info = kzalloc(sizeof(struct ion_cma_buffer_info), GFP_KERNEL);
-       if (!info) {
-               dev_err(dev, "Can't allocate buffer info\n");
+       if (!info)
                return ION_CMA_ALLOCATE_FAILED;
-       }
 
        info->cpu_addr = dma_alloc_coherent(dev, len, &(info->handle),
                                                GFP_HIGHUSER | __GFP_ZERO);
@@ -90,10 +88,8 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
        }
 
        info->table = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
-       if (!info->table) {
-               dev_err(dev, "Fail to allocate sg table\n");
+       if (!info->table)
                goto free_mem;
-       }
 
        if (ion_cma_get_sgtable
            (dev, info->table, info->cpu_addr, info->handle, len))
@@ -155,7 +151,6 @@ static struct sg_table *ion_cma_heap_map_dma(struct ion_heap *heap,
 static void ion_cma_heap_unmap_dma(struct ion_heap *heap,
                                   struct ion_buffer *buffer)
 {
-       return;
 }
 
 static int ion_cma_mmap(struct ion_heap *mapper, struct ion_buffer *buffer,