[PATCH v5 2/9] resources: factor out resource_clip() to simplify find_resource()

Bjorn Helgaas
2010-10-26T21:41:23Z

This factors out the min/max clipping to simplify find_resource().
No functional change.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---

kernel/resource.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/kernel/resource.c b/kernel/resource.c
index 7dc8ad2..26e9f25 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -365,6 +365,15 @@ static resource_size_t simple_align_resource(void *data,
return avail->start;
}

+static void resource_clip(struct resource *res, resource_size_t min,
+ resource_size_t max)
+{
+ if (res->start < min)
+ res->start = min;
+ if (res->end > max)
+ res->end = max;
+}
+
/*
* Find empty slot in the resource tree given range and alignment.
*/
@@ -394,10 +403,8 @@ static int find_resource(struct resource *root, struct resource *new,
tmp.end = this->start - 1;
else
tmp.end = root->end;
- if (tmp.start < min)
- tmp.start = min;
- if (tmp.end > max)
- tmp.end = max;
+
+ resource_clip(&tmp, min, max);
tmp.start = ALIGN(tmp.start, align);

tmp.start = alignf(alignf_data, &tmp, size, align);