Skip to content

Commit

Permalink
staging: android: ion: Remove base from ion_carveout_heap
Browse files Browse the repository at this point in the history
The base address is not used anywhere and tracked by the pool
allocator. No need to store this anymore.

Signed-off-by: Andrew F. Davis <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
glneo authored and gregkh committed Jan 18, 2019
1 parent 96d12a0 commit 298783c
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/staging/android/ion/ion_carveout_heap.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
struct ion_carveout_heap {
struct ion_heap heap;
struct gen_pool *pool;
phys_addr_t base;
};

static phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
Expand Down Expand Up @@ -125,8 +124,7 @@ struct ion_heap *ion_carveout_heap_create(phys_addr_t base, size_t size)
kfree(carveout_heap);
return ERR_PTR(-ENOMEM);
}
carveout_heap->base = base;
gen_pool_add(carveout_heap->pool, carveout_heap->base, size, -1);
gen_pool_add(carveout_heap->pool, base, size, -1);
carveout_heap->heap.ops = &carveout_heap_ops;
carveout_heap->heap.type = ION_HEAP_TYPE_CARVEOUT;
carveout_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;
Expand Down

0 comments on commit 298783c

Please sign in to comment.