1 files changed, 62 insertions, 81 deletions

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 14f8a6954da0..e315051cfeeb 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -77,22 +77,6 @@ static void memory_block_release(struct device *dev)
         kfree(mem);
 }
 
-/*
- * register_memory - Setup a sysfs device for a memory block
- */
-static
-int register_memory(struct memory_block *memory)
-{
-        int error;
-
-        memory->dev.bus = &memory_subsys;
-        memory->dev.id = memory->start_section_nr / sections_per_block;
-        memory->dev.release = memory_block_release;
-
-        error = device_register(&memory->dev);
-        return error;
-}
-
 unsigned long __weak memory_block_size_bytes(void)
 {
         return MIN_MEMORY_BLOCK_SIZE;
@@ -371,11 +355,6 @@ static DEVICE_ATTR(state, 0644, show_mem_state, store_mem_state);
 static DEVICE_ATTR(phys_device, 0444, show_phys_device, NULL);
 static DEVICE_ATTR(removable, 0444, show_mem_removable, NULL);
 
-#define mem_create_simple_file(mem, attr_name)  \
-        device_create_file(&mem->dev, &dev_attr_##attr_name)
-#define mem_remove_simple_file(mem, attr_name)  \
-        device_remove_file(&mem->dev, &dev_attr_##attr_name)
-
 /*
  * Block size attribute stuff
  */
@@ -388,12 +367,6 @@ print_block_size(struct device *dev, struct device_attribute *attr,
 
 static DEVICE_ATTR(block_size_bytes, 0444, print_block_size, NULL);
 
-static int block_size_init(void)
-{
-        return device_create_file(memory_subsys.dev_root,
-                                  &dev_attr_block_size_bytes);
-}
-
 /*
  * Some architectures will have custom drivers to do this, and
  * will not need to do it from userspace.  The fake hot-add code
@@ -429,17 +402,8 @@ memory_probe_store(struct device *dev, struct device_attribute *attr,
 out:
         return ret;
 }
-static DEVICE_ATTR(probe, S_IWUSR, NULL, memory_probe_store);
 
-static int memory_probe_init(void)
-{
-        return device_create_file(memory_subsys.dev_root, &dev_attr_probe);
-}
-#else
-static inline int memory_probe_init(void)
-{
-        return 0;
-}
+static DEVICE_ATTR(probe, S_IWUSR, NULL, memory_probe_store);
 #endif
 
 #ifdef CONFIG_MEMORY_FAILURE
@@ -485,23 +449,6 @@ store_hard_offline_page(struct device *dev,
 
 static DEVICE_ATTR(soft_offline_page, S_IWUSR, NULL, store_soft_offline_page);
 static DEVICE_ATTR(hard_offline_page, S_IWUSR, NULL, store_hard_offline_page);
-
-static __init int memory_fail_init(void)
-{
-        int err;
-
-        err = device_create_file(memory_subsys.dev_root,
-                                &dev_attr_soft_offline_page);
-        if (!err)
-                err = device_create_file(memory_subsys.dev_root,
-                                &dev_attr_hard_offline_page);
-        return err;
-}
-#else
-static inline int memory_fail_init(void)
-{
-        return 0;
-}
 #endif
 
 /*
@@ -546,6 +493,41 @@ struct memory_block *find_memory_block(struct mem_section *section)
         return find_memory_block_hinted(section, NULL);
 }
 
+static struct attribute *memory_memblk_attrs[] = {
+        &dev_attr_phys_index.attr,
+        &dev_attr_end_phys_index.attr,
+        &dev_attr_state.attr,
+        &dev_attr_phys_device.attr,
+        &dev_attr_removable.attr,
+        NULL
+};
+
+static struct attribute_group memory_memblk_attr_group = {
+        .attrs = memory_memblk_attrs,
+};
+
+static const struct attribute_group *memory_memblk_attr_groups[] = {
+        &memory_memblk_attr_group,
+        NULL,
+};
+
+/*
+ * register_memory - Setup a sysfs device for a memory block
+ */
+static
+int register_memory(struct memory_block *memory)
+{
+        int error;
+
+        memory->dev.bus = &memory_subsys;
+        memory->dev.id = memory->start_section_nr / sections_per_block;
+        memory->dev.release = memory_block_release;
+        memory->dev.groups = memory_memblk_attr_groups;
+
+        error = device_register(&memory->dev);
+        return error;
+}
+
 static int init_memory_block(struct memory_block **memory,
                              struct mem_section *section, unsigned long state)
 {
@@ -569,16 +551,6 @@ static int init_memory_block(struct memory_block **memory,
         mem->phys_device = arch_get_memory_phys_device(start_pfn);
 
         ret = register_memory(mem);
-        if (!ret)
-                ret = mem_create_simple_file(mem, phys_index);
-        if (!ret)
-                ret = mem_create_simple_file(mem, end_phys_index);
-        if (!ret)
-                ret = mem_create_simple_file(mem, state);
-        if (!ret)
-                ret = mem_create_simple_file(mem, phys_device);
-        if (!ret)
-                ret = mem_create_simple_file(mem, removable);
 
         *memory = mem;
         return ret;
@@ -656,14 +628,9 @@ static int remove_memory_block(unsigned long node_id,
         unregister_mem_sect_under_nodes(mem, __section_nr(section));
 
         mem->section_count--;
-        if (mem->section_count == 0) {
-                mem_remove_simple_file(mem, phys_index);
-                mem_remove_simple_file(mem, end_phys_index);
-                mem_remove_simple_file(mem, state);
-                mem_remove_simple_file(mem, phys_device);
-                mem_remove_simple_file(mem, removable);
+        if (mem->section_count == 0)
                 unregister_memory(mem);
-        } else
+        else
                 kobject_put(&mem->dev.kobj);
 
         mutex_unlock(&mem_sysfs_mutex);
@@ -700,6 +667,29 @@ bool is_memblock_offlined(struct memory_block *mem)
         return mem->state == MEM_OFFLINE;
 }
 
+static struct attribute *memory_root_attrs[] = {
+#ifdef CONFIG_ARCH_MEMORY_PROBE
+        &dev_attr_probe.attr,
+#endif
+
+#ifdef CONFIG_MEMORY_FAILURE
+        &dev_attr_soft_offline_page.attr,
+        &dev_attr_hard_offline_page.attr,
+#endif
+
+        &dev_attr_block_size_bytes.attr,
+        NULL
+};
+
+static struct attribute_group memory_root_attr_group = {
+        .attrs = memory_root_attrs,
+};
+
+static const struct attribute_group *memory_root_attr_groups[] = {
+        &memory_root_attr_group,
+        NULL,
+};
+
 /*
  * Initialize the sysfs support for memory devices...
  */
@@ -711,7 +701,7 @@ int __init memory_dev_init(void)
         unsigned long block_sz;
         struct memory_block *mem = NULL;
 
-        ret = subsys_system_register(&memory_subsys, NULL);
+        ret = subsys_system_register(&memory_subsys, memory_root_attr_groups);
         if (ret)
                 goto out;
 
@@ -734,15 +724,6 @@ int __init memory_dev_init(void)
                         ret = err;
         }
 
-        err = memory_probe_init();
-        if (!ret)
-                ret = err;
-        err = memory_fail_init();
-        if (!ret)
-                ret = err;
-        err = block_size_init();
-        if (!ret)
-                ret = err;
 out:
         if (ret)
                 printk(KERN_ERR "%s() failed: %d\n", __func__, ret);