Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d9735ef authored by Laura Abbott's avatar Laura Abbott Committed by Greg Kroah-Hartman
Browse files

staging: android: ion: Remove alignment from allocation field 



The align field was supposed to be used to specify the alignment of
the allocation. Nobody actually does anything with it except to check
if the alignment specified is out of bounds. Since this has no effect
on the actual allocation, just remove it.

Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c4e5271

drivers/staging/android/ion/ion-ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		struct ion_handle *handle;



		handle = ion_alloc(client, data.allocation.len,

						data.allocation.align,

						data.allocation.heap_id_mask,

						data.allocation.flags);

		if (IS_ERR(handle))

drivers/staging/android/ion/ion.c

+6 −8
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ static void ion_buffer_add(struct ion_device *dev, 
static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,

					    struct ion_device *dev,

					    unsigned long len,

					    unsigned long align,

					    unsigned long flags)

{

	struct ion_buffer *buffer;
@@ -119,15 +118,14 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
	buffer->flags = flags;

	kref_init(&buffer->ref);



	ret = heap->ops->allocate(heap, buffer, len, align, flags);

	ret = heap->ops->allocate(heap, buffer, len, flags);



	if (ret) {

		if (!(heap->flags & ION_HEAP_FLAG_DEFER_FREE))

			goto err2;



		ion_heap_freelist_drain(heap, 0);

		ret = heap->ops->allocate(heap, buffer, len, align,

					  flags);

		ret = heap->ops->allocate(heap, buffer, len, flags);

		if (ret)

			goto err2;

	}
@@ -401,7 +399,7 @@ static int ion_handle_add(struct ion_client *client, struct ion_handle *handle) 
}



struct ion_handle *ion_alloc(struct ion_client *client, size_t len,

			     size_t align, unsigned int heap_id_mask,

			     unsigned int heap_id_mask,

			     unsigned int flags)

{

	struct ion_handle *handle;
@@ -410,8 +408,8 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len, 
	struct ion_heap *heap;

	int ret;



	pr_debug("%s: len %zu align %zu heap_id_mask %u flags %x\n", __func__,

		 len, align, heap_id_mask, flags);

	pr_debug("%s: len %zu heap_id_mask %u flags %x\n", __func__,

		 len, heap_id_mask, flags);

	/*

	 * traverse the list of heaps available in this system in priority

	 * order.  If the heap type is supported by the client, and matches the
@@ -428,7 +426,7 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len, 
		/* if the caller didn't specify this heap id */

		if (!((1 << heap->id) & heap_id_mask))

			continue;

		buffer = ion_buffer_create(heap, dev, len, align, flags);

		buffer = ion_buffer_create(heap, dev, len, flags);

		if (!IS_ERR(buffer))

			break;

	}

drivers/staging/android/ion/ion.h

+1 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ struct ion_buffer; 
 * @name:	used for debug purposes

 * @base:	base address of heap in physical memory if applicable

 * @size:	size of the heap in bytes if applicable

 * @align:	required alignment in physical memory if applicable

 * @priv:	private info passed from the board file

 *

 * Provided by the board file.
@@ -93,8 +92,6 @@ void ion_client_destroy(struct ion_client *client); 
 * ion_alloc - allocate ion memory

 * @client:		the client

 * @len:		size of the allocation

 * @align:		requested allocation alignment, lots of hardware blocks

 *			have alignment requirements of some kind

 * @heap_id_mask:	mask of heaps to allocate from, if multiple bits are set

 *			heaps will be tried in order from highest to lowest

 *			id
@@ -106,7 +103,7 @@ void ion_client_destroy(struct ion_client *client); 
 * an opaque handle to it.

 */

struct ion_handle *ion_alloc(struct ion_client *client, size_t len,

			     size_t align, unsigned int heap_id_mask,

			     unsigned int heap_id_mask,

			     unsigned int flags);



/**

drivers/staging/android/ion/ion_carveout_heap.c

+3 −7
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ struct ion_carveout_heap { 
};



static ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,

					     unsigned long size,

					     unsigned long align)

					     unsigned long size)

{

	struct ion_carveout_heap *carveout_heap =

		container_of(heap, struct ion_carveout_heap, heap);
@@ -60,16 +59,13 @@ static void ion_carveout_free(struct ion_heap *heap, ion_phys_addr_t addr, 


static int ion_carveout_heap_allocate(struct ion_heap *heap,

				      struct ion_buffer *buffer,

				      unsigned long size, unsigned long align,

				      unsigned long size,

				      unsigned long flags)

{

	struct sg_table *table;

	ion_phys_addr_t paddr;

	int ret;



	if (align > PAGE_SIZE)

		return -EINVAL;



	table = kmalloc(sizeof(*table), GFP_KERNEL);

	if (!table)

		return -ENOMEM;
@@ -77,7 +73,7 @@ static int ion_carveout_heap_allocate(struct ion_heap *heap, 
	if (ret)

		goto err_free;



	paddr = ion_carveout_allocate(heap, size, align);

	paddr = ion_carveout_allocate(heap, size);

	if (paddr == ION_CARVEOUT_ALLOCATE_FAIL) {

		ret = -ENOMEM;

		goto err_free_table;

drivers/staging/android/ion/ion_chunk_heap.c

+3 −6
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct ion_chunk_heap { 


static int ion_chunk_heap_allocate(struct ion_heap *heap,

				   struct ion_buffer *buffer,

				   unsigned long size, unsigned long align,

				   unsigned long size,

				   unsigned long flags)

{

	struct ion_chunk_heap *chunk_heap =
@@ -46,9 +46,6 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap, 
	unsigned long num_chunks;

	unsigned long allocated_size;



	if (align > chunk_heap->chunk_size)

		return -EINVAL;



	allocated_size = ALIGN(size, chunk_heap->chunk_size);

	num_chunks = allocated_size / chunk_heap->chunk_size;
@@ -160,8 +157,8 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data) 
	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 %lu size %zu align %ld\n", __func__,

		 chunk_heap->base, heap_data->size, heap_data->align);

	pr_debug("%s: base %lu size %zu \n", __func__,

		 chunk_heap->base, heap_data->size);



	return &chunk_heap->heap;