Commit a9cea017 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes

resources: add a default alignf to simplify find_resource()

This removes a test from find_resource(), which is getting cluttered.
No functional change.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 1ca98fa6
......@@ -357,6 +357,14 @@ int __weak page_is_ram(unsigned long pfn)
return walk_system_ram_range(pfn, 1, NULL, __is_ram) == 1;
}
static resource_size_t simple_align_resource(void *data,
const struct resource *avail,
resource_size_t size,
resource_size_t align)
{
return avail->start;
}
/*
* Find empty slot in the resource tree given range and alignment.
*/
......@@ -391,8 +399,8 @@ static int find_resource(struct resource *root, struct resource *new,
if (tmp.end > max)
tmp.end = max;
tmp.start = ALIGN(tmp.start, align);
if (alignf)
tmp.start = alignf(alignf_data, &tmp, size, align);
tmp.start = alignf(alignf_data, &tmp, size, align);
if (tmp.start < tmp.end && tmp.end - tmp.start >= size - 1) {
new->start = tmp.start;
new->end = tmp.start + size - 1;
......@@ -428,6 +436,9 @@ int allocate_resource(struct resource *root, struct resource *new,
{
int err;
if (!alignf)
alignf = simple_align_resource;
write_lock(&resource_lock);
err = find_resource(root, new, size, min, max, align, alignf, alignf_data);
if (err >= 0 && __request_resource(root, new))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment