drivers/base/node.c: cleanup node_state_attr[]

use [index] = init_value
use N_xxxxx instead of hardcode.

Make it more readability and easier to add new state.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/base/node.c b/drivers/base/node.c
index fffed4c96bb3be25feb7e0ab25c5b574b9c50b8e..294e31626210bc396845ed6c1daba0d57b13e1a8 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -638,23 +638,23 @@ static ssize_t show_node_state(struct device *dev,
        { __ATTR(name, 0444, show_node_state, NULL), state }
 
 static struct node_attr node_state_attr[] = {
-       _NODE_ATTR(possible, N_POSSIBLE),
-       _NODE_ATTR(online, N_ONLINE),
-       _NODE_ATTR(has_normal_memory, N_NORMAL_MEMORY),
-       _NODE_ATTR(has_cpu, N_CPU),
+       [N_POSSIBLE] = _NODE_ATTR(possible, N_POSSIBLE),
+       [N_ONLINE] = _NODE_ATTR(online, N_ONLINE),
+       [N_NORMAL_MEMORY] = _NODE_ATTR(has_normal_memory, N_NORMAL_MEMORY),
 #ifdef CONFIG_HIGHMEM
-       _NODE_ATTR(has_high_memory, N_HIGH_MEMORY),
+       [N_HIGH_MEMORY] = _NODE_ATTR(has_high_memory, N_HIGH_MEMORY),
 #endif
+       [N_CPU] = _NODE_ATTR(has_cpu, N_CPU),
 };
 
 static struct attribute *node_state_attrs[] = {
-       &node_state_attr[0].attr.attr,
-       &node_state_attr[1].attr.attr,
-       &node_state_attr[2].attr.attr,
-       &node_state_attr[3].attr.attr,
+       &node_state_attr[N_POSSIBLE].attr.attr,
+       &node_state_attr[N_ONLINE].attr.attr,
+       &node_state_attr[N_NORMAL_MEMORY].attr.attr,
 #ifdef CONFIG_HIGHMEM
-       &node_state_attr[4].attr.attr,
+       &node_state_attr[N_HIGH_MEMORY].attr.attr,
 #endif
+       &node_state_attr[N_CPU].attr.attr,
        NULL
 };