提交 38a382ae 编写于 作者: G Greg Kroah-Hartman

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: NGreg Kroah-Hartman <gregkh@suse.de>
上级 7a6a4161
...@@ -366,10 +366,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) ...@@ -366,10 +366,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
"index%1lu", i); "index%1lu", i);
if (unlikely(retval)) { if (unlikely(retval)) {
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
kobject_unregister( kobject_put(&(LEAF_KOBJECT_PTR(cpu,j)->kobj));
&(LEAF_KOBJECT_PTR(cpu,j)->kobj));
} }
kobject_unregister(&all_cpu_cache_info[cpu].kobj); kobject_put(&all_cpu_cache_info[cpu].kobj);
cpu_cache_sysfs_exit(cpu); cpu_cache_sysfs_exit(cpu);
break; break;
} }
...@@ -386,10 +385,10 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev) ...@@ -386,10 +385,10 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev)
unsigned long i; unsigned long i;
for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++)
kobject_unregister(&(LEAF_KOBJECT_PTR(cpu,i)->kobj)); kobject_put(&(LEAF_KOBJECT_PTR(cpu,i)->kobj));
if (all_cpu_cache_info[cpu].kobj.parent) { if (all_cpu_cache_info[cpu].kobj.parent) {
kobject_unregister(&all_cpu_cache_info[cpu].kobj); kobject_put(&all_cpu_cache_info[cpu].kobj);
memset(&all_cpu_cache_info[cpu].kobj, memset(&all_cpu_cache_info[cpu].kobj,
0, 0,
sizeof(struct kobject)); sizeof(struct kobject));
......
...@@ -517,7 +517,7 @@ static int __init hypfs_init(void) ...@@ -517,7 +517,7 @@ static int __init hypfs_init(void)
return 0; return 0;
fail_filesystem: fail_filesystem:
kobject_unregister(s390_kobj); kobject_put(s390_kobj);
fail_sysfs: fail_sysfs:
if (!MACHINE_IS_VM) if (!MACHINE_IS_VM)
hypfs_diag_exit(); hypfs_diag_exit();
...@@ -531,7 +531,7 @@ static void __exit hypfs_exit(void) ...@@ -531,7 +531,7 @@ static void __exit hypfs_exit(void)
if (!MACHINE_IS_VM) if (!MACHINE_IS_VM)
hypfs_diag_exit(); hypfs_diag_exit();
unregister_filesystem(&hypfs_type); unregister_filesystem(&hypfs_type);
kobject_unregister(s390_kobj); kobject_put(s390_kobj);
} }
module_init(hypfs_init) module_init(hypfs_init)
......
...@@ -360,7 +360,7 @@ static int __devexit sq_sysdev_remove(struct sys_device *sysdev) ...@@ -360,7 +360,7 @@ static int __devexit sq_sysdev_remove(struct sys_device *sysdev)
unsigned int cpu = sysdev->id; unsigned int cpu = sysdev->id;
struct kobject *kobj = sq_kobject[cpu]; struct kobject *kobj = sq_kobject[cpu];
kobject_unregister(kobj); kobject_put(kobj);
return 0; return 0;
} }
......
...@@ -749,10 +749,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) ...@@ -749,10 +749,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
"index%1lu", i); "index%1lu", i);
if (unlikely(retval)) { if (unlikely(retval)) {
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
kobject_unregister( kobject_put(&(INDEX_KOBJECT_PTR(cpu,j)->kobj));
&(INDEX_KOBJECT_PTR(cpu,j)->kobj));
} }
kobject_unregister(cache_kobject[cpu]); kobject_put(cache_kobject[cpu]);
cpuid4_cache_sysfs_exit(cpu); cpuid4_cache_sysfs_exit(cpu);
break; break;
} }
...@@ -777,8 +776,8 @@ static void __cpuinit cache_remove_dev(struct sys_device * sys_dev) ...@@ -777,8 +776,8 @@ static void __cpuinit cache_remove_dev(struct sys_device * sys_dev)
cpu_clear(cpu, cache_dev_map); cpu_clear(cpu, cache_dev_map);
for (i = 0; i < num_cache_leaves; i++) for (i = 0; i < num_cache_leaves; i++)
kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj)); kobject_put(&(INDEX_KOBJECT_PTR(cpu,i)->kobj));
kobject_unregister(cache_kobject[cpu]); kobject_put(cache_kobject[cpu]);
cpuid4_cache_sysfs_exit(cpu); cpuid4_cache_sysfs_exit(cpu);
} }
......
...@@ -456,7 +456,7 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu, ...@@ -456,7 +456,7 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu,
out_free: out_free:
if (b) { if (b) {
kobject_unregister(&b->kobj); kobject_put(&b->kobj);
kfree(b); kfree(b);
} }
return err; return err;
...@@ -581,7 +581,7 @@ static void deallocate_threshold_block(unsigned int cpu, ...@@ -581,7 +581,7 @@ static void deallocate_threshold_block(unsigned int cpu,
return; return;
list_for_each_entry_safe(pos, tmp, &head->blocks->miscj, miscj) { list_for_each_entry_safe(pos, tmp, &head->blocks->miscj, miscj) {
kobject_unregister(&pos->kobj); kobject_put(&pos->kobj);
list_del(&pos->miscj); list_del(&pos->miscj);
kfree(pos); kfree(pos);
} }
...@@ -627,7 +627,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank) ...@@ -627,7 +627,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
deallocate_threshold_block(cpu, bank); deallocate_threshold_block(cpu, bank);
free_out: free_out:
kobject_unregister(b->kobj); kobject_put(b->kobj);
kfree(b); kfree(b);
per_cpu(threshold_banks, cpu)[bank] = NULL; per_cpu(threshold_banks, cpu)[bank] = NULL;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册