Kobject: change arch/x86/kernel/cpu/mcheck/mce_amd_64.c to use kobject_init_and_add

Stop using kobject_register, as this way we can control the sending of
the uevent properly, after everything is properly initialized.

Cc: Jacob Shin <jacob.shin@amd.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
index 2d65311d206e4c3684e2290ce6fdde658b83ab5b..ef15f35b10ed3a72811362f2e6524adf63cca263 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
@@ -432,10 +432,9 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu,
        else
                per_cpu(threshold_banks, cpu)[bank]->blocks = b;
 
-       kobject_set_name(&b->kobj, "misc%i", block);
-       b->kobj.parent = per_cpu(threshold_banks, cpu)[bank]->kobj;
-       b->kobj.ktype = &threshold_ktype;
-       err = kobject_register(&b->kobj);
+       err = kobject_init_and_add(&b->kobj, &threshold_ktype,
+                                  per_cpu(threshold_banks, cpu)[bank]->kobj,
+                                  "misc%i", block);
        if (err)
                goto out_free;
 recurse:
@@ -451,6 +450,8 @@ recurse:
        if (err)
                goto out_free;
 
+       kobject_uevent(&b->kobj, KOBJ_ADD);
+
        return err;
 
 out_free: