resource: Kill walk_iomem_res()

walk_iomem_res_desc() replaced walk_iomem_res() and there is no
caller to walk_iomem_res() any more. Kill it. Also remove @name
from find_next_iomem_res() as it is no longer used.

Signed-off-by: Toshi Kani <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Acked-by: Dave Young <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Hanjun Guo <[email protected]>
Cc: Jakub Sitnicki <[email protected]>
Cc: Jiang Liu <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Luis R. Rodriguez <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Toshi Kani <[email protected]>
Cc: Vinod Koul <[email protected]>
Cc: [email protected]
Cc: linux-mm <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 2a4a5e8399659535c2df47012292bf0ad8beb468..afb45597fb5f0d3aa19f6bb9fd0818995ae6623e 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -270,9 +270,6 @@ walk_system_ram_res(u64 start, u64 end, void *arg,
 extern int
 walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start, u64 end,
                    void *arg, int (*func)(u64, u64, void *));
 extern int
 walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start, u64 end,
                    void *arg, int (*func)(u64, u64, void *));

-extern int
-walk_iomem_res(char *name, unsigned long flags, u64 start, u64 end, void *arg,
-              int (*func)(u64, u64, void *));

 
 /* True if any part of r1 overlaps r2 */
 static inline bool resource_overlaps(struct resource *r1, struct resource *r2)
 
 /* True if any part of r1 overlaps r2 */
 static inline bool resource_overlaps(struct resource *r1, struct resource *r2)

diff --git a/kernel/resource.c b/kernel/resource.c
index 37ed2fcb8246098ff4a70634d8a6267a26091e25..49834309043c4d639becb95f6ee5c4f6b05d6666 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -335,13 +335,12 @@ EXPORT_SYMBOL(release_resource);
 /*
  * Finds the lowest iomem resource existing within [res->start.res->end).
  * The caller must specify res->start, res->end, res->flags, and optionally
 /*
  * Finds the lowest iomem resource existing within [res->start.res->end).
  * The caller must specify res->start, res->end, res->flags, and optionally

- * desc and "name".  If found, returns 0, res is overwritten, if not found,
- * returns -1.
+ * desc.  If found, returns 0, res is overwritten, if not found, returns -1.

  * This function walks the whole tree and not just first level children until
  * and unless first_level_children_only is true.
  */
 static int find_next_iomem_res(struct resource *res, unsigned long desc,
  * This function walks the whole tree and not just first level children until
  * and unless first_level_children_only is true.
  */
 static int find_next_iomem_res(struct resource *res, unsigned long desc,

-                              char *name, bool first_level_children_only)
+                              bool first_level_children_only)

 {
        resource_size_t start, end;
        struct resource *p;
 {
        resource_size_t start, end;
        struct resource *p;


@@ -363,8 +362,6 @@ static int find_next_iomem_res(struct resource *res, unsigned long desc,
                        continue;
                if ((desc != IORES_DESC_NONE) && (desc != p->desc))
                        continue;
                        continue;
                if ((desc != IORES_DESC_NONE) && (desc != p->desc))
                        continue;

-               if (name && strcmp(p->name, name))
-                       continue;

                if (p->start > end) {
                        p = NULL;
                        break;
                if (p->start > end) {
                        p = NULL;
                        break;


@@ -411,7 +408,7 @@ int walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start,
        orig_end = res.end;
 
        while ((res.start < res.end) &&
        orig_end = res.end;
 
        while ((res.start < res.end) &&

-               (!find_next_iomem_res(&res, desc, NULL, false))) {
+               (!find_next_iomem_res(&res, desc, false))) {

 
                ret = (*func)(res.start, res.end, arg);
                if (ret)
 
                ret = (*func)(res.start, res.end, arg);
                if (ret)


@@ -424,42 +421,6 @@ int walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start,
        return ret;
 }
 
        return ret;
 }
 

-/*
- * Walks through iomem resources and calls @func with matching resource
- * ranges. This walks the whole tree and not just first level children.
- * All the memory ranges which overlap start,end and also match flags and
- * name are valid candidates.
- *
- * @name: name of resource
- * @flags: resource flags
- * @start: start addr
- * @end: end addr
- *
- * NOTE: This function is deprecated and should not be used in new code.
- * Use walk_iomem_res_desc(), instead.
- */
-int walk_iomem_res(char *name, unsigned long flags, u64 start, u64 end,
-               void *arg, int (*func)(u64, u64, 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, IORES_DESC_NONE, name, false))) {
-               ret = (*func)(res.start, res.end, arg);
-               if (ret)
-                       break;
-               res.start = res.end + 1;
-               res.end = orig_end;
-       }
-       return ret;
-}
-

 /*
  * This function calls the @func callback against all memory ranges of type
  * System RAM which are marked as IORESOURCE_SYSTEM_RAM and IORESOUCE_BUSY.
 /*
  * This function calls the @func callback against all memory ranges of type
  * System RAM which are marked as IORESOURCE_SYSTEM_RAM and IORESOUCE_BUSY.


@@ -479,7 +440,7 @@ int walk_system_ram_res(u64 start, u64 end, void *arg,
        res.flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
        orig_end = res.end;
        while ((res.start < res.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, NULL, true))) {
+               (!find_next_iomem_res(&res, IORES_DESC_NONE, true))) {

                ret = (*func)(res.start, res.end, arg);
                if (ret)
                        break;
                ret = (*func)(res.start, res.end, arg);
                if (ret)
                        break;


@@ -509,7 +470,7 @@ int walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
        res.flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
        orig_end = res.end;
        while ((res.start < res.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, NULL, true) >= 0)) {
+               (find_next_iomem_res(&res, IORES_DESC_NONE, true) >= 0)) {

                pfn = (res.start + PAGE_SIZE - 1) >> PAGE_SHIFT;
                end_pfn = (res.end + 1) >> PAGE_SHIFT;
                if (end_pfn > pfn)
                pfn = (res.start + PAGE_SIZE - 1) >> PAGE_SHIFT;
                end_pfn = (res.end + 1) >> PAGE_SHIFT;
                if (end_pfn > pfn)