Skip to content

Commit

Permalink
mm: refactor unregister_cpu_under_node()
Browse files Browse the repository at this point in the history
By returning early if the node is not online, we can unindent the
interesting code by two levels.

No functional change.

Signed-off-by: Alex Chiang <achiang@hp.com>
Cc: Gary Hade <garyhade@us.ibm.com>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Rientjes <rientjes@google.com>
Cc: Greg KH <greg@kroah.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alex Chiang authored and Linus Torvalds committed Dec 15, 2009
1 parent f8246f3 commit b9d52da
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions drivers/base/node.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,18 @@ int register_cpu_under_node(unsigned int cpu, unsigned int nid)

int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
{
if (node_online(nid)) {
struct sys_device *obj = get_cpu_sysdev(cpu);
if (obj)
sysfs_remove_link(&node_devices[nid].sysdev.kobj,
kobject_name(&obj->kobj));
}
struct sys_device *obj;

if (!node_online(nid))
return 0;

obj = get_cpu_sysdev(cpu);
if (!obj)
return 0;

sysfs_remove_link(&node_devices[nid].sysdev.kobj,
kobject_name(&obj->kobj));

return 0;
}

Expand Down

0 comments on commit b9d52da

Please sign in to comment.