driver core: register_memory/unregister_memory clean ups and bugfix

[sfrench/cifs-2.6.git] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 7a1390cd6aad67f407d750a050caa192a9ab8f21..7891f7c97267402f19569cf8a1b015fc83bb2378 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -20,13 +20,14 @@
 #include <linux/kobject.h>
 #include <linux/memory_hotplug.h>
 #include <linux/mm.h>
+#include <linux/mutex.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 
 #define MEMORY_CLASS_NAME      "memory"
 
 static struct sysdev_class memory_sysdev_class = {
-       set_kset_name(MEMORY_CLASS_NAME),
+       .name = MEMORY_CLASS_NAME,
 };
 
 static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj)
@@ -61,8 +62,8 @@ void unregister_memory_notifier(struct notifier_block *nb)
 /*
  * register_memory - Setup a sysfs device for a memory block
  */
-int register_memory(struct memory_block *memory, struct mem_section *section,
-               struct node *root)
+static
+int register_memory(struct memory_block *memory, struct mem_section *section)
 {
        int error;
 
@@ -70,26 +71,18 @@ int register_memory(struct memory_block *memory, struct mem_section *section,
        memory->sysdev.id = __section_nr(section);
 
        error = sysdev_register(&memory->sysdev);
-
-       if (root && !error)
-               error = sysfs_create_link(&root->sysdev.kobj,
-                                         &memory->sysdev.kobj,
-                                         kobject_name(&memory->sysdev.kobj));
-
        return error;
 }
 
 static void
-unregister_memory(struct memory_block *memory, struct mem_section *section,
-               struct node *root)
+unregister_memory(struct memory_block *memory, struct mem_section *section)
 {
        BUG_ON(memory->sysdev.cls != &memory_sysdev_class);
        BUG_ON(memory->sysdev.id != __section_nr(section));
 
+       /* drop the ref. we got in remove_memory_block() */
+       kobject_put(&memory->sysdev.kobj);
        sysdev_unregister(&memory->sysdev);
-       if (root)
-               sysfs_remove_link(&root->sysdev.kobj,
-                                 kobject_name(&memory->sysdev.kobj));
 }
 
 /*
@@ -137,7 +130,7 @@ static ssize_t show_mem_state(struct sys_device *dev, char *buf)
        return len;
 }
 
-static inline int memory_notify(unsigned long val, void *v)
+int memory_notify(unsigned long val, void *v)
 {
        return blocking_notifier_call_chain(&memory_chain, val, v);
 }
@@ -183,7 +176,6 @@ memory_block_action(struct memory_block *mem, unsigned long action)
                        break;
                case MEM_OFFLINE:
                        mem->state = MEM_GOING_OFFLINE;
-                       memory_notify(MEM_GOING_OFFLINE, NULL);
                        start_paddr = page_to_pfn(first_page) << PAGE_SHIFT;
                        ret = remove_memory(start_paddr,
                                            PAGES_PER_SECTION << PAGE_SHIFT);
@@ -191,7 +183,6 @@ memory_block_action(struct memory_block *mem, unsigned long action)
                                mem->state = old_state;
                                break;
                        }
-                       memory_notify(MEM_MAPPING_INVALID, NULL);
                        break;
                default:
                        printk(KERN_WARNING "%s(%p, %ld) unknown action: %ld\n",
@@ -199,11 +190,6 @@ memory_block_action(struct memory_block *mem, unsigned long action)
                        WARN_ON(1);
                        ret = -EINVAL;
        }
-       /*
-        * For now, only notify on successful memory operations
-        */
-       if (!ret)
-               memory_notify(action, NULL);
 
        return ret;
 }
@@ -212,7 +198,7 @@ static int memory_block_change_state(struct memory_block *mem,
                unsigned long to_state, unsigned long from_state_req)
 {
        int ret = 0;
-       down(&mem->state_sem);
+       mutex_lock(&mem->state_mutex);
 
        if (mem->state != from_state_req) {
                ret = -EINVAL;
@@ -224,7 +210,7 @@ static int memory_block_change_state(struct memory_block *mem,
                mem->state = to_state;
 
 out:
-       up(&mem->state_sem);
+       mutex_unlock(&mem->state_mutex);
        return ret;
 }
 
@@ -238,7 +224,7 @@ store_mem_state(struct sys_device *dev, const char *buf, size_t count)
        mem = container_of(dev, struct memory_block, sysdev);
        phys_section_nr = mem->phys_index;
 
-       if (!valid_section_nr(phys_section_nr))
+       if (!present_section_nr(phys_section_nr))
                goto out;
 
        if (!strncmp(buf, "online", min((int)count, 6)))
@@ -348,10 +334,10 @@ static int add_memory_block(unsigned long node_id, struct mem_section *section,
 
        mem->phys_index = __section_nr(section);
        mem->state = state;
-       init_MUTEX(&mem->state_sem);
+       mutex_init(&mem->state_mutex);
        mem->phys_device = phys_device;
 
-       ret = register_memory(mem, section, NULL);
+       ret = register_memory(mem, section);
        if (!ret)
                ret = mem_create_simple_file(mem, phys_index);
        if (!ret)
@@ -402,7 +388,7 @@ int remove_memory_block(unsigned long node_id, struct mem_section *section,
        mem_remove_simple_file(mem, phys_index);
        mem_remove_simple_file(mem, state);
        mem_remove_simple_file(mem, phys_device);
-       unregister_memory(mem, section, NULL);
+       unregister_memory(mem, section);
 
        return 0;
 }
@@ -418,7 +404,7 @@ int register_new_memory(struct mem_section *section)
 
 int unregister_memory_section(struct mem_section *section)
 {
-       if (!valid_section(section))
+       if (!present_section(section))
                return -EINVAL;
 
        return remove_memory_block(0, section, 0);
@@ -443,7 +429,7 @@ int __init memory_dev_init(void)
         * during boot and have been initialized
         */
        for (i = 0; i < NR_MEM_SECTIONS; i++) {
-               if (!valid_section_nr(i))
+               if (!present_section_nr(i))
                        continue;
                err = add_memory_block(0, __nr_to_section(i), MEM_ONLINE, 0);
                if (!ret)