Commit 8559125b authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas

resource: Rename find_resource() to find_resource_space()

Rename find_resource() to find_resource_space() to better describe what the
function does. This is a preparation for exposing it beyond resource.c,
which is needed by PCI core. Also rename the __ variant to match the names.

Link: https://lore.kernel.org/r/20240507102523.57320-3-ilpo.jarvinen@linux.intel.comTested-by: default avatarLidong Wang <lidong.wang@intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 1613e604
...@@ -628,12 +628,11 @@ static void resource_clip(struct resource *res, resource_size_t min, ...@@ -628,12 +628,11 @@ static void resource_clip(struct resource *res, resource_size_t min,
} }
/* /*
* Find empty slot in the resource tree with the given range and * Find empty space in the resource tree with the given range and
* alignment constraints * alignment constraints
*/ */
static int __find_resource(struct resource *root, struct resource *old, static int __find_resource_space(struct resource *root, struct resource *old,
struct resource *new, struct resource *new, resource_size_t size,
resource_size_t size,
struct resource_constraint *constraint) struct resource_constraint *constraint)
{ {
struct resource *this = root->child; struct resource *this = root->child;
...@@ -688,13 +687,13 @@ next: if (!this || this->end == root->end) ...@@ -688,13 +687,13 @@ next: if (!this || this->end == root->end)
} }
/* /*
* Find empty slot in the resource tree given range and alignment. * Find empty space in the resource tree given range and alignment.
*/ */
static int find_resource(struct resource *root, struct resource *new, static int find_resource_space(struct resource *root, struct resource *new,
resource_size_t size, resource_size_t size,
struct resource_constraint *constraint) struct resource_constraint *constraint)
{ {
return __find_resource(root, NULL, new, size, constraint); return __find_resource_space(root, NULL, new, size, constraint);
} }
/** /**
...@@ -717,7 +716,7 @@ static int reallocate_resource(struct resource *root, struct resource *old, ...@@ -717,7 +716,7 @@ static int reallocate_resource(struct resource *root, struct resource *old,
write_lock(&resource_lock); write_lock(&resource_lock);
if ((err = __find_resource(root, old, &new, newsize, constraint))) if ((err = __find_resource_space(root, old, &new, newsize, constraint)))
goto out; goto out;
if (resource_contains(&new, old)) { if (resource_contains(&new, old)) {
...@@ -786,7 +785,7 @@ int allocate_resource(struct resource *root, struct resource *new, ...@@ -786,7 +785,7 @@ int allocate_resource(struct resource *root, struct resource *new,
} }
write_lock(&resource_lock); write_lock(&resource_lock);
err = find_resource(root, new, size, &constraint); err = find_resource_space(root, new, size, &constraint);
if (err >= 0 && __request_resource(root, new)) if (err >= 0 && __request_resource(root, new))
err = -EBUSY; err = -EBUSY;
write_unlock(&resource_lock); write_unlock(&resource_lock);
......
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