[PATCH 2/2] staging: android: ion: Remove file ion_chunk_heap.c

[Laura Abbott]

On 7/3/19 4:18 AM, Nishka Dasgupta wrote:
> Remove file ion_chunk_heap.c as its functions and definitions are not
> used anywhere else.
> Issue found with Coccinelle.
> 

Acked-by: Laura Abbott <labbott at redhat.com>

> Signed-off-by: Nishka Dasgupta <nishkadg.linux at gmail.com>
> ---
>   drivers/staging/android/ion/Kconfig          |   9 --
>   drivers/staging/android/ion/Makefile         |   1 -
>   drivers/staging/android/ion/ion_chunk_heap.c | 147 -------------------
>   3 files changed, 157 deletions(-)
>   delete mode 100644 drivers/staging/android/ion/ion_chunk_heap.c
> 
> diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig
> index dff641451a89..989fe84a9f9d 100644
> --- a/drivers/staging/android/ion/Kconfig
> +++ b/drivers/staging/android/ion/Kconfig
> @@ -18,15 +18,6 @@ config ION_SYSTEM_HEAP
>   	  Choose this option to enable the Ion system heap. The system heap
>   	  is backed by pages from the buddy allocator. If in doubt, say Y.
>   
> -config ION_CHUNK_HEAP
> -	bool "Ion chunk heap support"
> -	depends on ION
> -	help
> -          Choose this option to enable chunk heaps with Ion. This heap is
> -	  similar in function the carveout heap but memory is broken down
> -	  into smaller chunk sizes, typically corresponding to a TLB size.
> -	  Unless you know your system has these regions, you should say N here.
> -
>   config ION_CMA_HEAP
>   	bool "Ion CMA heap support"
>   	depends on ION && DMA_CMA
> diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile
> index 0ac5465e2841..5f4487b1a224 100644
> --- a/drivers/staging/android/ion/Makefile
> +++ b/drivers/staging/android/ion/Makefile
> @@ -1,5 +1,4 @@
>   # SPDX-License-Identifier: GPL-2.0
>   obj-$(CONFIG_ION) += ion.o ion_heap.o
>   obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o
> -obj-$(CONFIG_ION_CHUNK_HEAP) += ion_chunk_heap.o
>   obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o
> diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
> deleted file mode 100644
> index 1e869f4bad45..000000000000
> --- a/drivers/staging/android/ion/ion_chunk_heap.c
> +++ /dev/null
> @@ -1,147 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * ION memory allocator chunk heap helper
> - *
> - * Copyright (C) 2012 Google, Inc.
> - */
> -
> -#include <linux/dma-mapping.h>
> -#include <linux/err.h>
> -#include <linux/genalloc.h>
> -#include <linux/mm.h>
> -#include <linux/scatterlist.h>
> -#include <linux/slab.h>
> -
> -#include "ion.h"
> -
> -struct ion_chunk_heap {
> -	struct ion_heap heap;
> -	struct gen_pool *pool;
> -	unsigned long chunk_size;
> -	unsigned long size;
> -	unsigned long allocated;
> -};
> -
> -static int ion_chunk_heap_allocate(struct ion_heap *heap,
> -				   struct ion_buffer *buffer,
> -				   unsigned long size,
> -				   unsigned long flags)
> -{
> -	struct ion_chunk_heap *chunk_heap =
> -		container_of(heap, struct ion_chunk_heap, heap);
> -	struct sg_table *table;
> -	struct scatterlist *sg;
> -	int ret, i;
> -	unsigned long num_chunks;
> -	unsigned long allocated_size;
> -
> -	allocated_size = ALIGN(size, chunk_heap->chunk_size);
> -	num_chunks = allocated_size / chunk_heap->chunk_size;
> -
> -	if (allocated_size > chunk_heap->size - chunk_heap->allocated)
> -		return -ENOMEM;
> -
> -	table = kmalloc(sizeof(*table), GFP_KERNEL);
> -	if (!table)
> -		return -ENOMEM;
> -	ret = sg_alloc_table(table, num_chunks, GFP_KERNEL);
> -	if (ret) {
> -		kfree(table);
> -		return ret;
> -	}
> -
> -	sg = table->sgl;
> -	for (i = 0; i < num_chunks; i++) {
> -		unsigned long paddr = gen_pool_alloc(chunk_heap->pool,
> -						     chunk_heap->chunk_size);
> -		if (!paddr)
> -			goto err;
> -		sg_set_page(sg, pfn_to_page(PFN_DOWN(paddr)),
> -			    chunk_heap->chunk_size, 0);
> -		sg = sg_next(sg);
> -	}
> -
> -	buffer->sg_table = table;
> -	chunk_heap->allocated += allocated_size;
> -	return 0;
> -err:
> -	sg = table->sgl;
> -	for (i -= 1; i >= 0; i--) {
> -		gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
> -			      sg->length);
> -		sg = sg_next(sg);
> -	}
> -	sg_free_table(table);
> -	kfree(table);
> -	return -ENOMEM;
> -}
> -
> -static void ion_chunk_heap_free(struct ion_buffer *buffer)
> -{
> -	struct ion_heap *heap = buffer->heap;
> -	struct ion_chunk_heap *chunk_heap =
> -		container_of(heap, struct ion_chunk_heap, heap);
> -	struct sg_table *table = buffer->sg_table;
> -	struct scatterlist *sg;
> -	int i;
> -	unsigned long allocated_size;
> -
> -	allocated_size = ALIGN(buffer->size, chunk_heap->chunk_size);
> -
> -	ion_heap_buffer_zero(buffer);
> -
> -	for_each_sg(table->sgl, sg, table->nents, i) {
> -		gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
> -			      sg->length);
> -	}
> -	chunk_heap->allocated -= allocated_size;
> -	sg_free_table(table);
> -	kfree(table);
> -}
> -
> -static struct ion_heap_ops chunk_heap_ops = {
> -	.allocate = ion_chunk_heap_allocate,
> -	.free = ion_chunk_heap_free,
> -	.map_user = ion_heap_map_user,
> -	.map_kernel = ion_heap_map_kernel,
> -	.unmap_kernel = ion_heap_unmap_kernel,
> -};
> -
> -struct ion_heap *ion_chunk_heap_create(phys_addr_t base, size_t size,
> -				       size_t chunk_size)
> -{
> -	struct ion_chunk_heap *chunk_heap;
> -	int ret;
> -	struct page *page;
> -
> -	page = pfn_to_page(PFN_DOWN(base));
> -	ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL));
> -	if (ret)
> -		return ERR_PTR(ret);
> -
> -	chunk_heap = kzalloc(sizeof(*chunk_heap), GFP_KERNEL);
> -	if (!chunk_heap)
> -		return ERR_PTR(-ENOMEM);
> -
> -	chunk_heap->chunk_size = chunk_size;
> -	chunk_heap->pool = gen_pool_create(get_order(chunk_heap->chunk_size) +
> -					   PAGE_SHIFT, -1);
> -	if (!chunk_heap->pool) {
> -		ret = -ENOMEM;
> -		goto error_gen_pool_create;
> -	}
> -	chunk_heap->size = size;
> -	chunk_heap->allocated = 0;
> -
> -	gen_pool_add(chunk_heap->pool, base, size, -1);
> -	chunk_heap->heap.ops = &chunk_heap_ops;
> -	chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK;
> -	chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;
> -	pr_debug("%s: base %pa size %zu\n", __func__, &base, size);
> -
> -	return &chunk_heap->heap;
> -
> -error_gen_pool_create:
> -	kfree(chunk_heap);
> -	return ERR_PTR(ret);
> -}
>