diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-20 11:13:05 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 23:40:39 -0500 |
commit | 38a382ae5dd4f4d04e3046816b0a41836094e538 (patch) | |
tree | 9413139d10b195a8424127ea2467459fdccf3d05 /arch/ia64/kernel/topology.c | |
parent | 7a6a41615bfb2f03ce797bc24104c50b42c935e5 (diff) |
Kobject: convert arch/* from kobject_unregister() to kobject_put()
There is no need for kobject_unregister() anymore, thanks to Kay's
kobject cleanup changes, so replace all instances of it with
kobject_put().
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/ia64/kernel/topology.c')
-rw-r--r-- | arch/ia64/kernel/topology.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index c4311e3adf55..a2484fc1a06c 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
@@ -366,10 +366,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) | |||
366 | "index%1lu", i); | 366 | "index%1lu", i); |
367 | if (unlikely(retval)) { | 367 | if (unlikely(retval)) { |
368 | for (j = 0; j < i; j++) { | 368 | for (j = 0; j < i; j++) { |
369 | kobject_unregister( | 369 | kobject_put(&(LEAF_KOBJECT_PTR(cpu,j)->kobj)); |
370 | &(LEAF_KOBJECT_PTR(cpu,j)->kobj)); | ||
371 | } | 370 | } |
372 | kobject_unregister(&all_cpu_cache_info[cpu].kobj); | 371 | kobject_put(&all_cpu_cache_info[cpu].kobj); |
373 | cpu_cache_sysfs_exit(cpu); | 372 | cpu_cache_sysfs_exit(cpu); |
374 | break; | 373 | break; |
375 | } | 374 | } |
@@ -386,10 +385,10 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev) | |||
386 | unsigned long i; | 385 | unsigned long i; |
387 | 386 | ||
388 | for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) | 387 | for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) |
389 | kobject_unregister(&(LEAF_KOBJECT_PTR(cpu,i)->kobj)); | 388 | kobject_put(&(LEAF_KOBJECT_PTR(cpu,i)->kobj)); |
390 | 389 | ||
391 | if (all_cpu_cache_info[cpu].kobj.parent) { | 390 | if (all_cpu_cache_info[cpu].kobj.parent) { |
392 | kobject_unregister(&all_cpu_cache_info[cpu].kobj); | 391 | kobject_put(&all_cpu_cache_info[cpu].kobj); |
393 | memset(&all_cpu_cache_info[cpu].kobj, | 392 | memset(&all_cpu_cache_info[cpu].kobj, |
394 | 0, | 393 | 0, |
395 | sizeof(struct kobject)); | 394 | sizeof(struct kobject)); |