resource: introduce is_type_match() helper and use it

There are already a couple of places where we may replace a few lines of
code by calling a helper, which increases readability while deduplicating
the code.

Introduce is_type_match() helper and use it.

Link: https://lkml.kernel.org/r/20240925154355.1170859-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/kernel/resource.c b/kernel/resource.c
index 1c77ac239c7a4e82fb0adf6e502cf0da2646a8eb..55bc09f50e211a180bfe50ba21b1958d98e3ec21 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -297,6 +297,11 @@ int release_resource(struct resource *old)
 
 EXPORT_SYMBOL(release_resource);
 
+static bool is_type_match(struct resource *p, unsigned long flags, unsigned long desc)
+{
+       return (p->flags & flags) == flags && (desc == IORES_DESC_NONE || desc == p->desc);
+}
+
 /**
  * find_next_iomem_res - Finds the lowest iomem resource that covers part of
  *                      [@start..@end].
@@ -339,13 +344,9 @@ static int find_next_iomem_res(resource_size_t start, resource_size_t end,
                if (p->end < start)
                        continue;
 
-               if ((p->flags & flags) != flags)
-                       continue;
-               if ((desc != IORES_DESC_NONE) && (desc != p->desc))
-                       continue;
-
                /* Found a match, break */
-               break;
+               if (is_type_match(p, flags, desc))
+                       break;
        }
 
        if (p) {
@@ -540,7 +541,7 @@ static int __region_intersects(struct resource *parent, resource_size_t start,
        int type = 0; int other = 0;
        struct resource *p, *dp;
        struct resource res, o;
-       bool is_type, covered;
+       bool covered;
 
        res.start = start;
        res.end = start + size - 1;
@@ -548,9 +549,7 @@ static int __region_intersects(struct resource *parent, resource_size_t start,
        for (p = parent->child; p ; p = p->sibling) {
                if (!resource_intersection(p, &res, &o))
                        continue;
-               is_type = (p->flags & flags) == flags &&
-                       (desc == IORES_DESC_NONE || desc == p->desc);
-               if (is_type) {
+               if (is_type_match(p, flags, desc)) {
                        type++;
                        continue;
                }
@@ -570,9 +569,7 @@ static int __region_intersects(struct resource *parent, resource_size_t start,
                for_each_resource(p, dp, false) {
                        if (!resource_overlaps(dp, &res))
                                continue;
-                       is_type = (dp->flags & flags) == flags &&
-                               (desc == IORES_DESC_NONE || desc == dp->desc);
-                       if (is_type) {
+                       if (is_type_match(dp, flags, desc)) {
                                type++;
                                /*
                                 * Range from 'o.start' to 'dp->start'