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

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

staging: android: ion: Remove base from ion_carveout_heap 



The base address is not used anywhere and tracked by the pool
allocator. No need to store this anymore.

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

drivers/staging/android/ion/ion_carveout_heap.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ 
struct ion_carveout_heap {

struct ion_carveout_heap {

	struct ion_heap heap;

	struct ion_heap heap;

	struct gen_pool *pool;

	struct gen_pool *pool;

	phys_addr_t base;

};

};





static phys_addr_t ion_carveout_allocate(struct ion_heap *heap,

static phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
@@ -125,8 +124,7 @@ struct ion_heap *ion_carveout_heap_create(phys_addr_t base, size_t size) 
		kfree(carveout_heap);

		kfree(carveout_heap);

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);

	}

	}

	carveout_heap->base = base;

	gen_pool_add(carveout_heap->pool, base, size, -1);

	gen_pool_add(carveout_heap->pool, carveout_heap->base, size, -1);

	carveout_heap->heap.ops = &carveout_heap_ops;

	carveout_heap->heap.ops = &carveout_heap_ops;

	carveout_heap->heap.type = ION_HEAP_TYPE_CARVEOUT;

	carveout_heap->heap.type = ION_HEAP_TYPE_CARVEOUT;

	carveout_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;

	carveout_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;