resource: Provide resource struct in resource walk callback

[linux-block.git] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index 9b5f04404152c296af3a96132f27cfc80ffa9af9..8430042fa77b18800342ff46a91358f1d73d96db 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -400,6 +400,27 @@ static int find_next_iomem_res(struct resource *res, unsigned long desc,
        return 0;
 }
 
+static int __walk_iomem_res_desc(struct resource *res, unsigned long desc,
+                                bool first_level_children_only,
+                                void *arg,
+                                int (*func)(struct resource *, void *))
+{
+       u64 orig_end = res->end;
+       int ret = -1;
+
+       while ((res->start < res->end) &&
+              !find_next_iomem_res(res, desc, first_level_children_only)) {
+               ret = (*func)(res, arg);
+               if (ret)
+                       break;
+
+               res->start = res->end + 1;
+               res->end = orig_end;
+       }
+
+       return ret;
+}
+
 /*
  * Walks through iomem resources and calls func() with matching resource
  * ranges. This walks through whole tree and not just first level children.
@@ -415,29 +436,15 @@ static int find_next_iomem_res(struct resource *res, unsigned long desc,
  * <linux/ioport.h> and set it in 'desc' of a target resource entry.
  */
 int walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start,
-               u64 end, void *arg, int (*func)(u64, u64, void *))
+               u64 end, void *arg, int (*func)(struct resource *, void *))
 {
        struct resource res;
-       u64 orig_end;
-       int ret = -1;
 
        res.start = start;
        res.end = end;
        res.flags = flags;
-       orig_end = res.end;
-
-       while ((res.start < res.end) &&
-               (!find_next_iomem_res(&res, desc, false))) {
-
-               ret = (*func)(res.start, res.end, arg);
-               if (ret)
-                       break;
-
-               res.start = res.end + 1;
-               res.end = orig_end;
-       }
 
-       return ret;
+       return __walk_iomem_res_desc(&res, desc, false, arg, func);
 }
 
 /*
@@ -448,25 +455,16 @@ int walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start,
  * ranges.
  */
 int walk_system_ram_res(u64 start, u64 end, void *arg,
-                               int (*func)(u64, u64, void *))
+                               int (*func)(struct resource *, void *))
 {
        struct resource res;
-       u64 orig_end;
-       int ret = -1;
 
        res.start = start;
        res.end = end;
        res.flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
-       orig_end = res.end;
-       while ((res.start < res.end) &&
-               (!find_next_iomem_res(&res, IORES_DESC_NONE, true))) {
-               ret = (*func)(res.start, res.end, arg);
-               if (ret)
-                       break;
-               res.start = res.end + 1;
-               res.end = orig_end;
-       }
-       return ret;
+
+       return __walk_iomem_res_desc(&res, IORES_DESC_NONE, true,
+                                    arg, func);
 }
 
 #if !defined(CONFIG_ARCH_HAS_WALK_MEMORY)
@@ -508,6 +506,7 @@ static int __is_ram(unsigned long pfn, unsigned long nr_pages, void *arg)
 {
        return 1;
 }
+
 /*
  * This generic page_is_ram() returns true if specified address is
  * registered as System RAM in iomem_resource list.