lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resources: factor out resource_clip() to simplify find_resource()

Browse Source 
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>
This commit is contained in:
Bjorn Helgaas
2010-10-26 15:41:18 -06:00
committed by Jesse Barnes
parent a9cea01741
commit 5d6b1fa301
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/resource.c
View File

@@ -365,6 +365,15 @@ static resource_size_t simple_align_resource(void *data,
return avail->start; 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. * 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; tmp.end = this->start - 1;
else else
tmp.end = root->end; tmp.end = root->end;
if (tmp.start < min)
tmp.start = min; resource_clip(&tmp, min, max);
if (tmp.end > max)
tmp.end = max;
tmp.start = ALIGN(tmp.start, align); tmp.start = ALIGN(tmp.start, align);
tmp.start = alignf(alignf_data, &tmp, size, align); tmp.start = alignf(alignf_data, &tmp, size, align);