ion: fix sparse warnings (f63958d8) · Commits · e / devices / android_kernel_teracube_2e

drivers/staging/android/ion/ion.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -669,7 +669,7 @@ static int ion_debug_client_show(struct seq_file s, void unused)
	struct ion_client *client = s->private;		struct ion_client *client = s->private;
	struct rb_node *n;		struct rb_node *n;
	size_t sizes[ION_NUM_HEAP_IDS] = {0};		size_t sizes[ION_NUM_HEAP_IDS] = {0};
	const char *names[ION_NUM_HEAP_IDS] = {0};		const char *names[ION_NUM_HEAP_IDS] = {NULL};
	int i;		int i;

	mutex_lock(&client->lock);		mutex_lock(&client->lock);
	@@ -887,7 +887,7 @@ static void ion_buffer_sync_for_device(struct ion_buffer *buffer,
	mutex_unlock(&buffer->lock);		mutex_unlock(&buffer->lock);
	}		}

	int ion_vm_fault(struct vm_area_struct vma, struct vm_fault vmf)		static int ion_vm_fault(struct vm_area_struct vma, struct vm_fault vmf)
	{		{
	struct ion_buffer *buffer = vma->vm_private_data;		struct ion_buffer *buffer = vma->vm_private_data;
	unsigned long pfn;		unsigned long pfn;
	@@ -939,7 +939,7 @@ static void ion_vm_close(struct vm_area_struct *vma)
	mutex_unlock(&buffer->lock);		mutex_unlock(&buffer->lock);
	}		}

	struct vm_operations_struct ion_vma_ops = {		static struct vm_operations_struct ion_vma_ops = {
	.open = ion_vm_open,		.open = ion_vm_open,
	.close = ion_vm_close,		.close = ion_vm_close,
	.fault = ion_vm_fault,		.fault = ion_vm_fault,
	@@ -1030,7 +1030,7 @@ static void ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf, size_t start,
	mutex_unlock(&buffer->lock);		mutex_unlock(&buffer->lock);
	}		}

	struct dma_buf_ops dma_buf_ops = {		static struct dma_buf_ops dma_buf_ops = {
	.map_dma_buf = ion_map_dma_buf,		.map_dma_buf = ion_map_dma_buf,
	.unmap_dma_buf = ion_unmap_dma_buf,		.unmap_dma_buf = ion_unmap_dma_buf,
	.mmap = ion_mmap,		.mmap = ion_mmap,

drivers/staging/android/ion/ion_carveout_heap.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -85,7 +85,7 @@ static void ion_carveout_heap_free(struct ion_buffer *buffer)
	buffer->priv_phys = ION_CARVEOUT_ALLOCATE_FAIL;		buffer->priv_phys = ION_CARVEOUT_ALLOCATE_FAIL;
	}		}

	struct sg_table ion_carveout_heap_map_dma(struct ion_heap heap,		static struct sg_table ion_carveout_heap_map_dma(struct ion_heap heap,
	struct ion_buffer *buffer)		struct ion_buffer *buffer)
	{		{
	struct sg_table *table;		struct sg_table *table;
	@@ -104,7 +104,7 @@ struct sg_table ion_carveout_heap_map_dma(struct ion_heap heap,
	return table;		return table;
	}		}

	void ion_carveout_heap_unmap_dma(struct ion_heap *heap,		static void ion_carveout_heap_unmap_dma(struct ion_heap *heap,
	struct ion_buffer *buffer)		struct ion_buffer *buffer)
	{		{
	sg_free_table(buffer->sg_table);		sg_free_table(buffer->sg_table);

drivers/staging/android/ion/ion_chunk_heap.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -115,13 +115,13 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer)
	kfree(table);		kfree(table);
	}		}

	struct sg_table ion_chunk_heap_map_dma(struct ion_heap heap,		static struct sg_table ion_chunk_heap_map_dma(struct ion_heap heap,
	struct ion_buffer *buffer)		struct ion_buffer *buffer)
	{		{
	return buffer->priv_virt;		return buffer->priv_virt;
	}		}

	void ion_chunk_heap_unmap_dma(struct ion_heap *heap,		static void ion_chunk_heap_unmap_dma(struct ion_heap *heap,
	struct ion_buffer *buffer)		struct ion_buffer *buffer)
	{		{
	return;		return;

drivers/staging/android/ion/ion_cma_heap.c

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@ struct ion_cma_buffer_info {
	* This function could be replaced by dma_common_get_sgtable		* This function could be replaced by dma_common_get_sgtable
	* as soon as it will avalaible.		* as soon as it will avalaible.
	*/		*/
	int ion_cma_get_sgtable(struct device dev, struct sg_table sgt,		static int ion_cma_get_sgtable(struct device dev, struct sg_table sgt,
	void *cpu_addr, dma_addr_t handle, size_t size)		void *cpu_addr, dma_addr_t handle, size_t size)
	{		{
	struct page *page = virt_to_page(cpu_addr);		struct page *page = virt_to_page(cpu_addr);
	@@ -137,7 +137,7 @@ static int ion_cma_phys(struct ion_heap heap, struct ion_buffer buffer,
	return 0;		return 0;
	}		}

	struct sg_table ion_cma_heap_map_dma(struct ion_heap heap,		static struct sg_table ion_cma_heap_map_dma(struct ion_heap heap,
	struct ion_buffer *buffer)		struct ion_buffer *buffer)
	{		{
	struct ion_cma_buffer_info *info = buffer->priv_virt;		struct ion_cma_buffer_info *info = buffer->priv_virt;
	@@ -145,7 +145,7 @@ struct sg_table ion_cma_heap_map_dma(struct ion_heap heap,
	return info->table;		return info->table;
	}		}

	void ion_cma_heap_unmap_dma(struct ion_heap *heap,		static void ion_cma_heap_unmap_dma(struct ion_heap *heap,
	struct ion_buffer *buffer)		struct ion_buffer *buffer)
	{		{
	return;		return;
	@@ -162,7 +162,8 @@ static int ion_cma_mmap(struct ion_heap mapper, struct ion_buffer buffer,
	buffer->size);		buffer->size);
	}		}

	void ion_cma_map_kernel(struct ion_heap heap, struct ion_buffer *buffer)		static void ion_cma_map_kernel(struct ion_heap heap,
			struct ion_buffer *buffer)
	{		{
	struct ion_cma_buffer_info *info = buffer->priv_virt;		struct ion_cma_buffer_info *info = buffer->priv_virt;
	/* kernel memory mapping has been done at allocation time */		/* kernel memory mapping has been done at allocation time */

drivers/staging/android/ion/ion_heap.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ void ion_heap_map_kernel(struct ion_heap heap,
	struct page **tmp = pages;		struct page **tmp = pages;

	if (!pages)		if (!pages)
	return 0;		return NULL;

	if (buffer->flags & ION_FLAG_CACHED)		if (buffer->flags & ION_FLAG_CACHED)
	pgprot = PAGE_KERNEL;		pgprot = PAGE_KERNEL;
	@@ -193,7 +193,7 @@ size_t ion_heap_freelist_drain(struct ion_heap *heap, size_t size)
	return total_drained;		return total_drained;
	}		}

	int ion_heap_deferred_free(void *data)		static int ion_heap_deferred_free(void *data)
	{		{
	struct ion_heap *heap = data;		struct ion_heap *heap = data;