15 files changed, 43 insertions, 45 deletions

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index edb5108e5d0e..a56c782653be 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1530,7 +1530,7 @@ static int lapic_resume(struct sys_device *dev)
  */
 
 static struct sysdev_class lapic_sysclass = {
-        set_kset_name("lapic"),
+        .name           = "lapic",
         .resume         = lapic_resume,
         .suspend        = lapic_suspend,
 };
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index f28ccb588fba..fa6cdee6d303 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -639,7 +639,7 @@ static int lapic_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class lapic_sysclass = {
-        set_kset_name("lapic"),
+        .name           = "lapic",
         .resume         = lapic_resume,
         .suspend        = lapic_suspend,
 };
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 9f530ff43c21..8b4507b8469b 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -733,10 +733,8 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
         if (unlikely(retval < 0))
                 return retval;
 
-        cache_kobject[cpu]->parent = &sys_dev->kobj;
-        kobject_set_name(cache_kobject[cpu], "%s", "cache");
-        cache_kobject[cpu]->ktype = &ktype_percpu_entry;
-        retval = kobject_register(cache_kobject[cpu]);
+        retval = kobject_init_and_add(cache_kobject[cpu], &ktype_percpu_entry,
+                                      &sys_dev->kobj, "%s", "cache");
         if (retval < 0) {
                 cpuid4_cache_sysfs_exit(cpu);
                 return retval;
@@ -746,23 +744,23 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
                 this_object = INDEX_KOBJECT_PTR(cpu,i);
                 this_object->cpu = cpu;
                 this_object->index = i;
-                this_object->kobj.parent = cache_kobject[cpu];
-                kobject_set_name(&(this_object->kobj), "index%1lu", i);
-                this_object->kobj.ktype = &ktype_cache;
-                retval = kobject_register(&(this_object->kobj));
+                retval = kobject_init_and_add(&(this_object->kobj),
+                                              &ktype_cache, cache_kobject[cpu],
+                                              "index%1lu", i);
                 if (unlikely(retval)) {
                         for (j = 0; j < i; j++) {
-                                kobject_unregister(
-                                        &(INDEX_KOBJECT_PTR(cpu,j)->kobj));
+                                kobject_put(&(INDEX_KOBJECT_PTR(cpu,j)->kobj));
                         }
-                        kobject_unregister(cache_kobject[cpu]);
+                        kobject_put(cache_kobject[cpu]);
                         cpuid4_cache_sysfs_exit(cpu);
                         break;
                 }
+                kobject_uevent(&(this_object->kobj), KOBJ_ADD);
         }
         if (!retval)
                 cpu_set(cpu, cache_dev_map);
 
+        kobject_uevent(cache_kobject[cpu], KOBJ_ADD);
         return retval;
 }
 
@@ -778,8 +776,8 @@ static void __cpuinit cache_remove_dev(struct sys_device * sys_dev)
         cpu_clear(cpu, cache_dev_map);
 
         for (i = 0; i < num_cache_leaves; i++)
-                kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj));
-        kobject_unregister(cache_kobject[cpu]);
+                kobject_put(&(INDEX_KOBJECT_PTR(cpu,i)->kobj));
+        kobject_put(cache_kobject[cpu]);
         cpuid4_cache_sysfs_exit(cpu);
 }
 
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index 4b21d29fb5aa..242e8668dbeb 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -745,7 +745,7 @@ static void mce_restart(void)
 
 static struct sysdev_class mce_sysclass = {
         .resume = mce_resume,
-        set_kset_name("machinecheck"),
+        .name = "machinecheck",
 };
 
 DEFINE_PER_CPU(struct sys_device, device_mce);
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
index 752fb16a817d..753588755fee 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
@@ -65,7 +65,7 @@ static struct threshold_block threshold_defaults = {
 };
 
 struct threshold_bank {
-        struct kobject kobj;
+        struct kobject *kobj;
         struct threshold_block *blocks;
         cpumask_t cpus;
 };
@@ -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,11 +450,13 @@ recurse:
         if (err)
                 goto out_free;
 
+        kobject_uevent(&b->kobj, KOBJ_ADD);
+
         return err;
 
 out_free:
         if (b) {
-                kobject_unregister(&b->kobj);
+                kobject_put(&b->kobj);
                 kfree(b);
         }
         return err;
@@ -489,7 +490,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
                         goto out;
 
                 err = sysfs_create_link(&per_cpu(device_mce, cpu).kobj,
-                                        &b->kobj, name);
+                                        b->kobj, name);
                 if (err)
                         goto out;
 
@@ -505,16 +506,15 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
                 goto out;
         }
 
-        kobject_set_name(&b->kobj, "threshold_bank%i", bank);
-        b->kobj.parent = &per_cpu(device_mce, cpu).kobj;
+        b->kobj = kobject_create_and_add(name, &per_cpu(device_mce, cpu).kobj);
+        if (!b->kobj)
+                goto out_free;
+
 #ifndef CONFIG_SMP
         b->cpus = CPU_MASK_ALL;
 #else
         b->cpus = per_cpu(cpu_core_map, cpu);
 #endif
-        err = kobject_register(&b->kobj);
-        if (err)
-                goto out_free;
 
         per_cpu(threshold_banks, cpu)[bank] = b;
 
@@ -531,7 +531,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
                         continue;
 
                 err = sysfs_create_link(&per_cpu(device_mce, i).kobj,
-                                        &b->kobj, name);
+                                        b->kobj, name);
                 if (err)
                         goto out;
 
@@ -581,7 +581,7 @@ static void deallocate_threshold_block(unsigned int cpu,
                 return;
 
         list_for_each_entry_safe(pos, tmp, &head->blocks->miscj, miscj) {
-                kobject_unregister(&pos->kobj);
+                kobject_put(&pos->kobj);
                 list_del(&pos->miscj);
                 kfree(pos);
         }
@@ -627,7 +627,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
         deallocate_threshold_block(cpu, bank);
 
 free_out:
-        kobject_unregister(&b->kobj);
+        kobject_put(b->kobj);
         kfree(b);
         per_cpu(threshold_banks, cpu)[bank] = NULL;
 }
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 05c9936a16cc..d387c770c518 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -157,15 +157,15 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
 
         switch (action) {
         case CPU_UP_PREPARE:
-        case CPU_UP_PREPARE_FROZEN:
                 err = cpuid_device_create(cpu);
                 break;
         case CPU_UP_CANCELED:
-        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
-        case CPU_DEAD_FROZEN:
                 cpuid_device_destroy(cpu);
                 break;
+        case CPU_UP_CANCELED_FROZEN:
+                destroy_suspended_device(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
+                break;
         }
         return err ? NOTIFY_BAD : NOTIFY_OK;
 }
diff --git a/arch/x86/kernel/i8237.c b/arch/x86/kernel/i8237.c
index 29313832df0c..dbd6c1d1b638 100644
--- a/arch/x86/kernel/i8237.c
+++ b/arch/x86/kernel/i8237.c
@@ -51,7 +51,7 @@ static int i8237A_suspend(struct sys_device *dev, pm_message_t state)
 }
 
 static struct sysdev_class i8237_sysdev_class = {
-        set_kset_name("i8237"),
+        .name = "i8237",
         .suspend = i8237A_suspend,
         .resume = i8237A_resume,
 };
diff --git a/arch/x86/kernel/i8259_32.c b/arch/x86/kernel/i8259_32.c
index f634fc715c99..5f3496d01984 100644
--- a/arch/x86/kernel/i8259_32.c
+++ b/arch/x86/kernel/i8259_32.c
@@ -258,7 +258,7 @@ static int i8259A_shutdown(struct sys_device *dev)
 }
 
 static struct sysdev_class i8259_sysdev_class = {
-        set_kset_name("i8259"),
+        .name = "i8259",
         .suspend = i8259A_suspend,
         .resume = i8259A_resume,
         .shutdown = i8259A_shutdown,
diff --git a/arch/x86/kernel/i8259_64.c b/arch/x86/kernel/i8259_64.c
index 3f27ea0b9816..ba6d57286f56 100644
--- a/arch/x86/kernel/i8259_64.c
+++ b/arch/x86/kernel/i8259_64.c
@@ -370,7 +370,7 @@ static int i8259A_shutdown(struct sys_device *dev)
 }
 
 static struct sysdev_class i8259_sysdev_class = {
-        set_kset_name("i8259"),
+        .name = "i8259",
         .suspend = i8259A_suspend,
         .resume = i8259A_resume,
         .shutdown = i8259A_shutdown,
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index a6b1490e00c4..ab77f1905469 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -2401,7 +2401,7 @@ static int ioapic_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class ioapic_sysdev_class = {
-        set_kset_name("ioapic"),
+        .name = "ioapic",
         .suspend = ioapic_suspend,
         .resume = ioapic_resume,
 };
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index cbac1670c7c3..23a3ac06a23e 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1850,7 +1850,7 @@ static int ioapic_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class ioapic_sysdev_class = {
-        set_kset_name("ioapic"),
+        .name = "ioapic",
         .suspend = ioapic_suspend,
         .resume = ioapic_resume,
 };
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index ee6eba4ecfea..21f6e3c0be18 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -155,15 +155,15 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
 
         switch (action) {
         case CPU_UP_PREPARE:
-        case CPU_UP_PREPARE_FROZEN:
                 err = msr_device_create(cpu);
                 break;
         case CPU_UP_CANCELED:
-        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
-        case CPU_DEAD_FROZEN:
                 msr_device_destroy(cpu);
                 break;
+        case CPU_UP_CANCELED_FROZEN:
+                destroy_suspended_device(msr_class, MKDEV(MSR_MAJOR, cpu));
+                break;
         }
         return err ? NOTIFY_BAD : NOTIFY_OK;
 }
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index 852db2906921..4f4bfd3a88b6 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -176,7 +176,7 @@ static int lapic_nmi_resume(struct sys_device *dev)
 
 
 static struct sysdev_class nmi_sysclass = {
-        set_kset_name("lapic_nmi"),
+        .name           = "lapic_nmi",
         .resume         = lapic_nmi_resume,
         .suspend        = lapic_nmi_suspend,
 };
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index 4253c4e8849c..c3d1476b6a11 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -211,7 +211,7 @@ static int lapic_nmi_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class nmi_sysclass = {
-        set_kset_name("lapic_nmi"),
+        .name           = "lapic_nmi",
         .resume         = lapic_nmi_resume,
         .suspend        = lapic_nmi_suspend,
 };
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 944bbcdd2b8d..c8ab79ef4276 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -51,7 +51,7 @@ static int nmi_resume(struct sys_device *dev)
 
 
 static struct sysdev_class oprofile_sysclass = {
-        set_kset_name("oprofile"),
+        .name           = "oprofile",
         .resume         = nmi_resume,
         .suspend        = nmi_suspend,
 };