From: Phong Tran Date: Sun, 20 Jul 2014 04:10:55 +0000 (+0700) Subject: staging: android: ion: ion_cma_heap.c: Fix checkpatch warning X-Git-Tag: v3.17-rc1~123^2~397 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f0ca3e87cc132b67c40ba1161cd02c8a2985ac4c;p=karo-tx-linux.git staging: android: ion: ion_cma_heap.c: Fix checkpatch warning This patch fix coding style: - Remove "fail memory allocation" waring - Remove return of void function Tested by compilation only Signed-off-by: Phong Tran Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c index ce68ecfed31f..f8cabcbc39e5 100644 --- a/drivers/staging/android/ion/ion_cma_heap.c +++ b/drivers/staging/android/ion/ion_cma_heap.c @@ -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,