drivers: base: use device get/put functions

Use the [get|put]_device functions for ref'ing the memory block device
rather than the kobject functions which should be hidden away by the
device layer.

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index b31d998a63a594e91012dc98900ee661ccf179d2..e97519bc3d067a9b4f48352aa6c1cc376a5e1a56 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -616,14 +616,14 @@ static int add_memory_section(int nid, struct mem_section *section,
                        if (scn_nr >= (*mem_p)->start_section_nr &&
                            scn_nr <= (*mem_p)->end_section_nr) {
                                mem = *mem_p;
-                               kobject_get(&mem->dev.kobj);
+                               get_device(&mem->dev);
                        }
        } else
                mem = find_memory_block(section);
 
        if (mem) {
                mem->section_count++;
-               kobject_put(&mem->dev.kobj);
+               put_device(&mem->dev);
        } else {
                ret = init_memory_block(&mem, section, state);
                /* store memory_block pointer for next loop */
@@ -663,7 +663,7 @@ unregister_memory(struct memory_block *memory)
        BUG_ON(memory->dev.bus != &memory_subsys);
 
        /* drop the ref. we got in remove_memory_block() */
-       kobject_put(&memory->dev.kobj);
+       put_device(&memory->dev);
        device_unregister(&memory->dev);
 }
 
@@ -680,7 +680,7 @@ static int remove_memory_block(unsigned long node_id,
        if (mem->section_count == 0)
                unregister_memory(mem);
        else
-               kobject_put(&mem->dev.kobj);
+               put_device(&mem->dev);
 
        mutex_unlock(&mem_sysfs_mutex);
        return 0;