mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
staging: android: ion: Get rid of ion_reserve
ion_reserve was supposed to be used to reserve memory in board files. These days, board files are no more and there are other more controlled mechanisms for reserving memory. Get rid of this function. Signed-off-by: Laura Abbott <labbott@redhat.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0ba5aa477f
commit
04b8290f3b
2 changed files with 0 additions and 45 deletions
|
@ -1650,37 +1650,3 @@ void ion_device_destroy(struct ion_device *dev)
|
|||
}
|
||||
EXPORT_SYMBOL(ion_device_destroy);
|
||||
|
||||
void __init ion_reserve(struct ion_platform_data *data)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < data->nr; i++) {
|
||||
if (data->heaps[i].size == 0)
|
||||
continue;
|
||||
|
||||
if (data->heaps[i].base == 0) {
|
||||
phys_addr_t paddr;
|
||||
|
||||
paddr = memblock_alloc_base(data->heaps[i].size,
|
||||
data->heaps[i].align,
|
||||
MEMBLOCK_ALLOC_ANYWHERE);
|
||||
if (!paddr) {
|
||||
pr_err("%s: error allocating memblock for heap %d\n",
|
||||
__func__, i);
|
||||
continue;
|
||||
}
|
||||
data->heaps[i].base = paddr;
|
||||
} else {
|
||||
int ret = memblock_reserve(data->heaps[i].base,
|
||||
data->heaps[i].size);
|
||||
if (ret)
|
||||
pr_err("memblock reserve of %zx@%lx failed\n",
|
||||
data->heaps[i].size,
|
||||
data->heaps[i].base);
|
||||
}
|
||||
pr_info("%s: %s reserved base %lx size %zu\n", __func__,
|
||||
data->heaps[i].name,
|
||||
data->heaps[i].base,
|
||||
data->heaps[i].size);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -72,17 +72,6 @@ struct ion_platform_data {
|
|||
struct ion_platform_heap *heaps;
|
||||
};
|
||||
|
||||
/**
|
||||
* ion_reserve() - reserve memory for ion heaps if applicable
|
||||
* @data: platform data specifying starting physical address and
|
||||
* size
|
||||
*
|
||||
* Calls memblock reserve to set aside memory for heaps that are
|
||||
* located at specific memory addresses or of specific sizes not
|
||||
* managed by the kernel
|
||||
*/
|
||||
void ion_reserve(struct ion_platform_data *data);
|
||||
|
||||
/**
|
||||
* ion_client_create() - allocate a client and returns it
|
||||
* @dev: the global ion device
|
||||
|
|
Loading…
Reference in a new issue