From patchwork Mon Jul 12 15:44:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Fontenot X-Patchwork-Id: 58627 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id D4817100C32 for ; Tue, 13 Jul 2010 01:44:39 +1000 (EST) Received: by ozlabs.org (Postfix) id 2BE11B6F18; Tue, 13 Jul 2010 01:44:34 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e39.co.us.ibm.com (e39.co.us.ibm.com [32.97.110.160]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e39.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id B8A56B6F0C for ; Tue, 13 Jul 2010 01:44:33 +1000 (EST) Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e39.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o6CFYxOG025113 for ; Mon, 12 Jul 2010 09:34:59 -0600 Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o6CFiFmb104100 for ; Mon, 12 Jul 2010 09:44:16 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o6CFiBaC008017 for ; Mon, 12 Jul 2010 09:44:11 -0600 Received: from [9.53.40.150] (mudbug-009053040150.austin.ibm.com [9.53.40.150]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o6CFiAM6007995; Mon, 12 Jul 2010 09:44:10 -0600 Message-ID: <4C3B384A.4000902@austin.ibm.com> Date: Mon, 12 Jul 2010 10:44:10 -0500 From: Nathan Fontenot User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.10) Gecko/20100527 Thunderbird/3.0.5 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org Subject: [PATCH 3/7] Update the [register,unregister]_memory routines References: <4C3B3446.5090302@austin.ibm.com> In-Reply-To: <4C3B3446.5090302@austin.ibm.com> Cc: linuxppc-dev@ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org This patch moves the register/unregister_memory routines to avoid a forward declaration. It also moves the sysfs file creation and deletion for each directory into the register/ unregister routines to avoid duplicating it with these updates. Signed-off-by: Nathan Fontenot --- drivers/base/memory.c | 93 +++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 45 deletions(-) Index: linux-2.6/drivers/base/memory.c =================================================================== --- linux-2.6.orig/drivers/base/memory.c 2010-07-09 14:23:17.000000000 -0500 +++ linux-2.6/drivers/base/memory.c 2010-07-09 14:23:20.000000000 -0500 @@ -87,31 +87,6 @@ EXPORT_SYMBOL(unregister_memory_isolate_notifier); /* - * register_memory - Setup a sysfs device for a memory block - */ -static -int register_memory(struct memory_block *memory, struct mem_section *section) -{ - int error; - - memory->sysdev.cls = &memory_sysdev_class; - memory->sysdev.id = __section_nr(section); - - error = sysdev_register(&memory->sysdev); - return error; -} - -static void -unregister_memory(struct memory_block *memory) -{ - BUG_ON(memory->sysdev.cls != &memory_sysdev_class); - - /* drop the ref. we got in remove_memory_block() */ - kobject_put(&memory->sysdev.kobj); - sysdev_unregister(&memory->sysdev); -} - -/* * use this as the physical section index that this memsection * uses. */ @@ -346,6 +321,53 @@ sysdev_remove_file(&mem->sysdev, &attr_##attr_name) /* + * register_memory - Setup a sysfs device for a memory block + */ +static +int register_memory(struct memory_block *memory, struct mem_section *section, + int nid, enum mem_add_context context) +{ + int ret; + + memory->sysdev.cls = &memory_sysdev_class; + memory->sysdev.id = __section_nr(section); + + ret = sysdev_register(&memory->sysdev); + if (!ret) + ret = mem_create_simple_file(memory, phys_index); + if (!ret) + ret = mem_create_simple_file(memory, end_phys_index); + if (!ret) + ret = mem_create_simple_file(memory, state); + if (!ret) + ret = mem_create_simple_file(memory, phys_device); + if (!ret) + ret = mem_create_simple_file(memory, removable); + if (!ret) { + if (context == HOTPLUG) + ret = register_mem_sect_under_node(memory, nid); + } + + return ret; +} + +static void +unregister_memory(struct memory_block *memory) +{ + BUG_ON(memory->sysdev.cls != &memory_sysdev_class); + + mem_remove_simple_file(memory, phys_index); + mem_remove_simple_file(memory, end_phys_index); + mem_remove_simple_file(memory, state); + mem_remove_simple_file(memory, phys_device); + mem_remove_simple_file(memory, removable); + + /* drop the ref. we got in remove_memory_block() */ + kobject_put(&memory->sysdev.kobj); + sysdev_unregister(&memory->sysdev); +} + +/* * Block size attribute stuff */ static ssize_t @@ -541,21 +563,7 @@ mem->phys_device = arch_get_memory_phys_device(start_pfn); INIT_LIST_HEAD(&mem->sections); - ret = register_memory(mem, section); - 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); - if (!ret) { - if (context == HOTPLUG) - ret = register_mem_sect_under_node(mem, nid); - } + ret = register_memory(mem, section, nid, context); } else { kobject_put(&mem->sysdev.kobj); } @@ -591,11 +599,6 @@ if (list_empty(&mem->sections)) { unregister_mem_sect_under_nodes(mem); - 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); unregister_memory(mem); kfree(mem); }