Merge branch 'hid-suspend' into picolcd

[pandora-kernel.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 7012279..985abd7 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -15,9 +15,13 @@
 #include <linux/cpu.h>
 #include <linux/device.h>
 #include <linux/swap.h>
+#include <linux/gfp.h>
+
+static struct sysdev_class_attribute *node_state_attrs[];
 
 static struct sysdev_class node_class = {
        .name = "node",
+       .attrs = node_state_attrs,
 };
 
 
@@ -162,8 +166,11 @@ static ssize_t node_read_distance(struct sys_device * dev,
        int len = 0;
        int i;
 
-       /* buf currently PAGE_SIZE, need ~4 chars per node */
-       BUILD_BUG_ON(MAX_NUMNODES*4 > PAGE_SIZE/2);
+       /*
+        * buf is currently PAGE_SIZE in length and each node needs 4 chars
+        * at the most (distance + space or newline).
+        */
+       BUILD_BUG_ON(MAX_NUMNODES * 4 > PAGE_SIZE);
 
        for_each_online_node(i)
                len += sprintf(buf + len, "%s%d", i ? " " : "", node_distance(nid, i));
@@ -544,76 +551,52 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
        return n;
 }
 
-static ssize_t print_nodes_possible(struct sysdev_class *class, char *buf)
-{
-       return print_nodes_state(N_POSSIBLE, buf);
-}
-
-static ssize_t print_nodes_online(struct sysdev_class *class, char *buf)
-{
-       return print_nodes_state(N_ONLINE, buf);
-}
-
-static ssize_t print_nodes_has_normal_memory(struct sysdev_class *class,
-                                               char *buf)
-{
-       return print_nodes_state(N_NORMAL_MEMORY, buf);
-}
+struct node_attr {
+       struct sysdev_class_attribute attr;
+       enum node_states state;
+};
 
-static ssize_t print_nodes_has_cpu(struct sysdev_class *class, char *buf)
+static ssize_t show_node_state(struct sysdev_class *class,
+                              struct sysdev_class_attribute *attr, char *buf)
 {
-       return print_nodes_state(N_CPU, buf);
+       struct node_attr *na = container_of(attr, struct node_attr, attr);
+       return print_nodes_state(na->state, buf);
 }
 
-static SYSDEV_CLASS_ATTR(possible, 0444, print_nodes_possible, NULL);
-static SYSDEV_CLASS_ATTR(online, 0444, print_nodes_online, NULL);
-static SYSDEV_CLASS_ATTR(has_normal_memory, 0444, print_nodes_has_normal_memory,
-                                                                       NULL);
-static SYSDEV_CLASS_ATTR(has_cpu, 0444, print_nodes_has_cpu, NULL);
+#define _NODE_ATTR(name, state) \
+       { _SYSDEV_CLASS_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),
 #ifdef CONFIG_HIGHMEM
-static ssize_t print_nodes_has_high_memory(struct sysdev_class *class,
-                                                char *buf)
-{
-       return print_nodes_state(N_HIGH_MEMORY, buf);
-}
-
-static SYSDEV_CLASS_ATTR(has_high_memory, 0444, print_nodes_has_high_memory,
-                                                                        NULL);
+       _NODE_ATTR(has_high_memory, N_HIGH_MEMORY),
 #endif
+};
 
-struct sysdev_class_attribute *node_state_attr[] = {
-       &attr_possible,
-       &attr_online,
-       &attr_has_normal_memory,
+static struct sysdev_class_attribute *node_state_attrs[] = {
+       &node_state_attr[0].attr,
+       &node_state_attr[1].attr,
+       &node_state_attr[2].attr,
+       &node_state_attr[3].attr,
 #ifdef CONFIG_HIGHMEM
-       &attr_has_high_memory,
+       &node_state_attr[4].attr,
 #endif
-       &attr_has_cpu,
+       NULL
 };
 
-static int node_states_init(void)
-{
-       int i;
-       int err = 0;
-
-       for (i = 0;  i < NR_NODE_STATES; i++) {
-               int ret;
-               ret = sysdev_class_create_file(&node_class, node_state_attr[i]);
-               if (!err)
-                       err = ret;
-       }
-       return err;
-}
-
 #define NODE_CALLBACK_PRI      2       /* lower than SLAB */
 static int __init register_node_type(void)
 {
        int ret;
 
+       BUILD_BUG_ON(ARRAY_SIZE(node_state_attr) != NR_NODE_STATES);
+       BUILD_BUG_ON(ARRAY_SIZE(node_state_attrs)-1 != NR_NODE_STATES);
+
        ret = sysdev_class_register(&node_class);
        if (!ret) {
-               ret = node_states_init();
                hotplug_memory_notifier(node_memory_callback,
                                        NODE_CALLBACK_PRI);
        }