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

Commit 4d5119f4 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Greg Kroah-Hartman
Browse files

staging: android: ion: Fixup some white-space issues 



Add white-space for easier reading and remove some where it does
not belong. No functional changes, they just bug me..

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c72f4e31

drivers/staging/android/ion/ion_carveout_heap.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static void ion_carveout_free(struct ion_heap *heap, phys_addr_t addr, 


	if (addr == ION_CARVEOUT_ALLOCATE_FAIL)

		return;



	gen_pool_free(carveout_heap->pool, addr, size);

}

drivers/staging/android/ion/ion_chunk_heap.c

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *

 * Copyright (C) 2012 Google, Inc.

 */



#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/genalloc.h>
@@ -147,4 +148,3 @@ struct ion_heap *ion_chunk_heap_create(phys_addr_t base, size_t size, size_t chu 
	kfree(chunk_heap);

	return ERR_PTR(ret);

}

drivers/staging/android/ion/ion_heap.c

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <uapi/linux/sched/types.h>

#include <linux/scatterlist.h>

#include <linux/vmalloc.h>



#include "ion.h"



void *ion_heap_map_kernel(struct ion_heap *heap,
@@ -92,6 +93,7 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer, 
		if (addr >= vma->vm_end)

			return 0;

	}



	return 0;

}
@@ -254,6 +256,7 @@ int ion_heap_init_deferred_free(struct ion_heap *heap) 
		return PTR_ERR_OR_ZERO(heap->task);

	}

	sched_setscheduler(heap->task, SCHED_IDLE, &param);



	return 0;

}
@@ -265,8 +268,10 @@ static unsigned long ion_heap_shrink_count(struct shrinker *shrinker, 
	int total = 0;



	total = ion_heap_freelist_size(heap) / PAGE_SIZE;



	if (heap->ops->shrink)

		total += heap->ops->shrink(heap, sc->gfp_mask, 0);



	return total;

}
@@ -295,6 +300,7 @@ static unsigned long ion_heap_shrink_scan(struct shrinker *shrinker, 


	if (heap->ops->shrink)

		freed += heap->ops->shrink(heap, sc->gfp_mask, to_scan);



	return freed;

}

drivers/staging/android/ion/ion_system_heap.c

+5 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/scatterlist.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>



#include "ion.h"



#define NUM_ORDERS ARRAY_SIZE(orders)
@@ -236,6 +237,7 @@ static int ion_system_heap_create_pools(struct ion_page_pool **pools) 
			goto err_create_pool;

		pools[i] = pool;

	}



	return 0;



err_create_pool:
@@ -274,6 +276,7 @@ static int ion_system_heap_create(void) 
	heap->name = "ion_system_heap";



	ion_device_add_heap(heap);



	return 0;

}

device_initcall(ion_system_heap_create);
@@ -355,6 +358,7 @@ static struct ion_heap *__ion_system_contig_heap_create(void) 
	heap->ops = &kmalloc_ops;

	heap->type = ION_HEAP_TYPE_SYSTEM_CONTIG;

	heap->name = "ion_system_contig_heap";



	return heap;

}
@@ -367,7 +371,7 @@ static int ion_system_contig_heap_create(void) 
		return PTR_ERR(heap);



	ion_device_add_heap(heap);



	return 0;

}

device_initcall(ion_system_contig_heap_create);