[PATCH 2/4] x86,mm/pat: Cleanup some of the local memtype_rb_* calls

[Davidlohr Bueso]

Cleanup by both getting rid of passing the rb_root down the helper
calls; there is only one. Secondly rename some of the calls from
memtype_rb_*.

Signed-off-by: Davidlohr Bueso <dbu...@suse.de>
---
 arch/x86/mm/pat_rbtree.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
index 4998d690d927..7974136ea1f6 100644
--- a/arch/x86/mm/pat_rbtree.c
+++ b/arch/x86/mm/pat_rbtree.c
@@ -52,12 +52,11 @@ enum {
        MEMTYPE_END_MATCH       = 1
 };
 
-static struct memtype *memtype_match(struct rb_root_cached *root,
-                                    u64 start, u64 end, int match_type)
+static struct memtype *memtype_match(u64 start, u64 end, int match_type)
 {
        struct memtype *match;
 
-       match = memtype_interval_iter_first(root, start, end);
+       match = memtype_interval_iter_first(&memtype_rbroot, start, end);
        while (match != NULL && match->start < end) {
                if ((match_type == MEMTYPE_EXACT_MATCH) &&
                    (match->start == start) && (match->end == end))
@@ -73,10 +72,9 @@ static struct memtype *memtype_match(struct rb_root_cached 
*root,
        return NULL; /* Returns NULL if there is no match */
 }
 
-static int memtype_rb_check_conflict(struct rb_root_cached *root,
-                               u64 start, u64 end,
-                               enum page_cache_mode reqtype,
-                               enum page_cache_mode *newtype)
+static int memtype_check_conflict(u64 start, u64 end,
+                                 enum page_cache_mode reqtype,
+                                 enum page_cache_mode *newtype)
 {
        struct memtype *match;
        enum page_cache_mode found_type = reqtype;
@@ -116,7 +114,7 @@ int rbt_memtype_check_insert(struct memtype *new,
 {
        int err = 0;
 
-       err = memtype_rb_check_conflict(&memtype_rbroot, new->start, new->end,
+       err = memtype_check_conflict(new->start, new->end,
                                        new->type, ret_type);
        if (err)
                goto done;
@@ -139,11 +137,9 @@ struct memtype *rbt_memtype_erase(u64 start, u64 end)
         * it then checks with END_MATCH, i.e. shrink the size of a node
         * from the end for the mremap case.
         */
-       data = memtype_match(&memtype_rbroot, start, end,
-                            MEMTYPE_EXACT_MATCH);
+       data = memtype_match(start, end, MEMTYPE_EXACT_MATCH);
        if (!data) {
-               data = memtype_match(&memtype_rbroot, start, end,
-                                    MEMTYPE_END_MATCH);
+               data = memtype_match(start, end, MEMTYPE_END_MATCH);
                if (!data)
                        return ERR_PTR(-EINVAL);
        }
-- 
2.16.4