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

Commit e1d855b0 authored by John Stultz's avatar John Stultz Committed by Greg Kroah-Hartman
Browse files

ion: Cleanup whitespace issues and other checkpatch problems 



Just some simple cleanups to address whitespace issues and
other issues found w/ checkpatch.

Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 661f82f6

drivers/staging/android/ion/ion.c

+28 −25
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ struct ion_handle { 


bool ion_buffer_fault_user_mappings(struct ion_buffer *buffer)

{

	return ((buffer->flags & ION_FLAG_CACHED) &&

		!(buffer->flags & ION_FLAG_CACHED_NEEDS_SYNC));

	return (buffer->flags & ION_FLAG_CACHED) &&

		!(buffer->flags & ION_FLAG_CACHED_NEEDS_SYNC);

}



bool ion_buffer_cached(struct ion_buffer *buffer)
@@ -202,7 +202,8 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
	buffer->size = len;



	table = heap->ops->map_dma(heap, buffer);

	if (WARN_ONCE(table == NULL, "heap->ops->map_dma should return ERR_PTR on error"))

	if (WARN_ONCE(table == NULL,

			"heap->ops->map_dma should return ERR_PTR on error"))

		table = ERR_PTR(-EINVAL);

	if (IS_ERR(table)) {

		heap->ops->free(buffer);
@@ -424,7 +425,8 @@ static struct ion_handle *ion_handle_get_by_id(struct ion_client *client, 
	return handle ? handle : ERR_PTR(-EINVAL);

}



static bool ion_handle_validate(struct ion_client *client, struct ion_handle *handle)

static bool ion_handle_validate(struct ion_client *client,

				struct ion_handle *handle)

{

	WARN_ON(!mutex_is_locked(&client->lock));

	return (idr_find(&client->idr, handle->id) == handle);
@@ -578,7 +580,8 @@ static void *ion_buffer_kmap_get(struct ion_buffer *buffer) 
		return buffer->vaddr;

	}

	vaddr = buffer->heap->ops->map_kernel(buffer->heap, buffer);

	if (WARN_ONCE(vaddr == NULL, "heap->ops->map_kernel should return ERR_PTR on error"))

	if (WARN_ONCE(vaddr == NULL,

			"heap->ops->map_kernel should return ERR_PTR on error"))

		return ERR_PTR(-EINVAL);

	if (IS_ERR(vaddr))

		return vaddr;

drivers/staging/android/ion/ion_chunk_heap.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 * GNU General Public License for more details.

 *

 */

//#include <linux/spinlock.h>

#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/genalloc.h>

drivers/staging/android/ion/ion_heap.c

+2 −3
Original line number Diff line number Diff line
@@ -49,10 +49,9 @@ void *ion_heap_map_kernel(struct ion_heap *heap, 
		int npages_this_entry = PAGE_ALIGN(sg->length) / PAGE_SIZE;

		struct page *page = sg_page(sg);

		BUG_ON(i >= npages);

		for (j = 0; j < npages_this_entry; j++) {

		for (j = 0; j < npages_this_entry; j++)

			*(tmp++) = page++;

	}

	}

	vaddr = vmap(pages, npages, VM_MAP, pgprot);

	vfree(pages);

drivers/staging/android/ion/ion_system_heap.c

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ static int ion_system_heap_allocate(struct ion_heap *heap, 


	INIT_LIST_HEAD(&pages);

	while (size_remaining > 0) {

		info = alloc_largest_available(sys_heap, buffer, size_remaining, max_order);

		info = alloc_largest_available(sys_heap, buffer, size_remaining,

						max_order);

		if (!info)

			goto err;

		list_add_tail(&info->list, &pages);

drivers/staging/android/ion/ion.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/android/ion/ion_page_pool.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/android/ion/ion_priv.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/android/ion/compat_ion.c

+2 −2

File changed.

Contains only whitespace changes.