hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86/mm/pat: Use rb_entry() 

To make the code clearer, use rb_entry() instead of open coding it

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Link: http://lkml.kernel.org/r/974a91cd4ed2d04c92e4faa4765077e38f248d6b.1482157956.git.geliangtang@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Geliang Tang 2016-12-19 22:35:57 +08:00 committed by Thomas Gleixner
parent e64d5fbe56
commit 1013fe32a6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/mm/pat_rbtree.c
View File

@ -47,7 +47,7 @@ static u64 get_subtree_max_end(struct rb_node *node)
{ {
u64 ret = 0; u64 ret = 0;
if (node) { if (node) {
struct memtype *data = container_of(node, struct memtype, rb); struct memtype *data = rb_entry(node, struct memtype, rb);
ret = data->subtree_max_end; ret = data->subtree_max_end;
} }
return ret; return ret;
@ -79,7 +79,7 @@ static struct memtype *memtype_rb_lowest_match(struct rb_root *root,
struct memtype *last_lower = NULL; struct memtype *last_lower = NULL;
while (node) { while (node) {
struct memtype *data = container_of(node, struct memtype, rb); struct memtype *data = rb_entry(node, struct memtype, rb);
if (get_subtree_max_end(node->rb_left) > start) { if (get_subtree_max_end(node->rb_left) > start) {
/* Lowest overlap if any must be on left side */ /* Lowest overlap if any must be on left side */
@ -121,7 +121,7 @@ static struct memtype *memtype_rb_match(struct rb_root *root,
node = rb_next(&match->rb); node = rb_next(&match->rb);
if (node) if (node)
match = container_of(node, struct memtype, rb); match = rb_entry(node, struct memtype, rb);
else else
match = NULL; match = NULL;
} }
@ -150,7 +150,7 @@ static int memtype_rb_check_conflict(struct rb_root *root,
node = rb_next(&match->rb); node = rb_next(&match->rb);
while (node) { while (node) {
match = container_of(node, struct memtype, rb); match = rb_entry(node, struct memtype, rb);
if (match->start >= end) /* Checked all possible matches */ if (match->start >= end) /* Checked all possible matches */
goto success; goto success;
@ -181,7 +181,7 @@ static void memtype_rb_insert(struct rb_root *root, struct memtype *newdata)
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
while (*node) { while (*node) {
struct memtype *data = container_of(*node, struct memtype, rb); struct memtype *data = rb_entry(*node, struct memtype, rb);
parent = *node; parent = *node;
if (data->subtree_max_end < newdata->end) if (data->subtree_max_end < newdata->end)
@ -270,7 +270,7 @@ int rbt_memtype_copy_nth_element(struct memtype *out, loff_t pos)
} }
if (node) { /* pos == i */ if (node) { /* pos == i */
struct memtype *this = container_of(node, struct memtype, rb); struct memtype *this = rb_entry(node, struct memtype, rb);
*out = *this; *out = *this;
return 0; return 0;
} else { } else {