lmb: Remove lmb_alloc_addr_flags()
lmb_alloc_addr() is just calling lmb_alloc_addr_flags() with LMB_NONE
There's not much we gain from this abstraction, so let's remove the
latter, add a flags argument to lmb_alloc_addr() and make the code a
bit easier to follow.
Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
Tested-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
(cherry picked from commit 15e0c5e390)
This commit is contained in:
committed by
Simon Glass
parent
b42d3ffb5f
commit
e005799d8f
@@ -471,7 +471,7 @@ static efi_status_t efi_allocate_pages_(enum efi_allocate_type type,
|
||||
if (*memory & EFI_PAGE_MASK)
|
||||
return EFI_NOT_FOUND;
|
||||
|
||||
addr = (u64)lmb_alloc_addr_flags(*memory, len, flags);
|
||||
addr = (u64)lmb_alloc_addr(*memory, len, flags);
|
||||
if (!addr)
|
||||
return EFI_NOT_FOUND;
|
||||
break;
|
||||
|
||||
15
lib/lmb.c
15
lib/lmb.c
@@ -759,8 +759,7 @@ phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align,
|
||||
return alloc;
|
||||
}
|
||||
|
||||
static phys_addr_t _lmb_alloc_addr(phys_addr_t base, phys_size_t size,
|
||||
u32 flags)
|
||||
static phys_addr_t _lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags)
|
||||
{
|
||||
long rgn;
|
||||
struct lmb_region *lmb_memory = lmb.available_mem.data;
|
||||
@@ -784,17 +783,7 @@ static phys_addr_t _lmb_alloc_addr(phys_addr_t base, phys_size_t size,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Try to allocate a specific address range: must be in defined memory but not
|
||||
* reserved
|
||||
*/
|
||||
phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size)
|
||||
{
|
||||
return _lmb_alloc_addr(base, size, LMB_NONE);
|
||||
}
|
||||
|
||||
phys_addr_t lmb_alloc_addr_flags(phys_addr_t base, phys_size_t size,
|
||||
uint flags)
|
||||
phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size, uint flags)
|
||||
{
|
||||
return _lmb_alloc_addr(base, size, flags);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user