resources: factor out resource_clip() to simplify find_resource()
Bjorn Helgaas [Tue, 26 Oct 2010 21:41:18 +0000 (15:41 -0600)]
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>

kernel/resource.c

index 7dc8ad2..26e9f25 100644 (file)
@@ -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);