Skip to content

Commit

Permalink
staging: android: ion: Fixup some white-space issues
Browse files Browse the repository at this point in the history
Add white-space for easier reading and remove some where it does
not belong. No functional changes, they just bug me..

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Andrew F. Davis authored and Greg Kroah-Hartman committed Jan 18, 2019
1 parent c72f4e3 commit 4d5119f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
1 change: 1 addition & 0 deletions drivers/staging/android/ion/ion_carveout_heap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/android/ion/ion_chunk_heap.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
* Copyright (C) 2012 Google, Inc.
*/

#include <linux/dma-mapping.h>
#include <linux/err.h>
#include <linux/genalloc.h>
Expand Down Expand Up @@ -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);
}

6 changes: 6 additions & 0 deletions drivers/staging/android/ion/ion_heap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down
6 changes: 5 additions & 1 deletion drivers/staging/android/ion/ion_system_heap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand All @@ -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);

0 comments on commit 4d5119f

Please sign in to comment.