diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2010-10-26 15:41:18 -0600 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-10-26 15:33:24 -0700 |
| commit | 5d6b1fa301b13cc651ee717a9b518124dea2f814 (patch) | |
| tree | 53958650b23a85cbd1b58ebd9346fe62603c3a0d /kernel/resource.c | |
| parent | a9cea017411c95ec789092971f9baaef1f826883 (diff) | |
| download | linux-5d6b1fa301b13cc651ee717a9b518124dea2f814.tar.gz linux-5d6b1fa301b13cc651ee717a9b518124dea2f814.tar.bz2 linux-5d6b1fa301b13cc651ee717a9b518124dea2f814.zip | |
resources: factor out resource_clip() to simplify find_resource()
This factors out the min/max clipping to simplify find_resource().
No functional change.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 7dc8ad24f915..26e9f2546923 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); |