Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

This can be broken down into these major areas:
 - Documentation updates (language translations and fixes, as
   well as kobject and kset documenatation updates.)
 - major kset/kobject/ktype rework and fixes.  This cleans up the
   kset and kobject and ktype relationship and architecture,
   making sense of things now, and good documenation and samples
   are provided for others to use.  Also the attributes for
   kobjects are much easier to handle now.  This cleaned up a LOT
   of code all through the kernel, making kobjects easier to use
   if you want to.
 - struct bus_type has been reworked to now handle the lifetime
   rules properly, as the kobject is properly dynamic.
 - struct driver has also been reworked, and now the lifetime
   issues are resolved.
 - the block subsystem has been converted to use struct device
   now, and not "raw" kobjects.  This patch has been in the -mm
   tree for over a year now, and finally all the issues are
   worked out with it.  Older distros now properly work with new
   kernels, and no userspace updates are needed at all.
 - nozomi driver is added.  This has also been in -mm for a long
   time, and many people have asked for it to go in.  It is now
   in good enough shape to do so.
 - lots of class_device conversions to use struct device instead.
   The tree is almost all cleaned up now, only SCSI and IB is the
   remaining code to fix up...

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (196 commits)
  Driver core: coding style fixes
  Kobject: fix coding style issues in kobject c files
  Kobject: fix coding style issues in kobject.h
  Driver core: fix coding style issues in device.h
  spi: use class iteration api
  scsi: use class iteration api
  rtc: use class iteration api
  power supply : use class iteration api
  ieee1394: use class iteration api
  Driver Core: add class iteration api
  Driver core: Cleanup get_device_parent() in device_add() and device_move()
  UIO: constify function pointer tables
  Driver Core: constify the name passed to platform_device_register_simple
  driver core: fix build with SYSFS=n
  sysfs: make SYSFS_DEPRECATED depend on SYSFS
  Driver core: use LIST_HEAD instead of call to INIT_LIST_HEAD in __init
  kobject: add sample code for how to use ksets/ktypes/kobjects
  kobject: add sample code for how to use kobjects in a simple manner.
  kobject: update the kobject/kset documentation
  kobject: remove old, outdated documentation.
  ...

50 files changed, 214 insertions, 199 deletions

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 1533d3ecd7a0..f6f3689a86ee 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -195,7 +195,7 @@ static int leds_shutdown(struct sys_device *dev)
 }
 
 static struct sysdev_class leds_sysclass = {
-        set_kset_name("leds"),
+        .name           = "leds",
         .shutdown       = leds_shutdown,
         .suspend        = leds_suspend,
         .resume         = leds_resume,
@@ -369,7 +369,7 @@ static int timer_resume(struct sys_device *dev)
 #endif
 
 static struct sysdev_class timer_sysclass = {
-        set_kset_name("timer"),
+        .name           = "timer",
         .suspend        = timer_suspend,
         .resume         = timer_resume,
 };
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 72280754354d..df37e93c6fc9 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -214,7 +214,7 @@ static int irq_resume(struct sys_device *dev)
 #endif
 
 static struct sysdev_class irq_class = {
-        set_kset_name("irq"),
+        .name           = "irq",
         .suspend        = irq_suspend,
         .resume         = irq_resume,
 };
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 3bf01e28df33..d9805e3d9304 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -69,14 +69,14 @@ static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
 
 static unsigned short enable_dyn_sleep = 1;
 
-static ssize_t omap_pm_sleep_while_idle_show(struct kset *kset, char *buf)
+static ssize_t idle_show(struct kobject *kobj, struct kobj_attribute *attr,
+                         char *buf)
 {
         return sprintf(buf, "%hu\n", enable_dyn_sleep);
 }
 
-static ssize_t omap_pm_sleep_while_idle_store(struct kset *kset,
-                                              const char * buf,
-                                              size_t n)
+static ssize_t idle_store(struct kobject *kobj, struct kobj_attribute *attr,
+                          const char * buf, size_t n)
 {
         unsigned short value;
         if (sscanf(buf, "%hu", &value) != 1 ||
@@ -88,16 +88,9 @@ static ssize_t omap_pm_sleep_while_idle_store(struct kset *kset,
         return n;
 }
 
-static struct subsys_attribute sleep_while_idle_attr = {
-        .attr   = {
-                .name = __stringify(sleep_while_idle),
-                .mode = 0644,
-        },
-        .show   = omap_pm_sleep_while_idle_show,
-        .store  = omap_pm_sleep_while_idle_store,
-};
+static struct kobj_attribute sleep_while_idle_attr =
+        __ATTR(sleep_while_idle, 0644, idle_show, idle_store);
 
-extern struct kset power_subsys;
 static void (*omap_sram_idle)(void) = NULL;
 static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL;
 
@@ -726,9 +719,9 @@ static int __init omap_pm_init(void)
         omap_pm_init_proc();
 #endif
 
-        error = subsys_create_file(&power_subsys, &sleep_while_idle_attr);
+        error = sysfs_create_file(power_kobj, &sleep_while_idle_attr);
         if (error)
-                printk(KERN_ERR "subsys_create_file failed: %d\n", error);
+                printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
 
         if (cpu_is_omap16xx()) {
                 /* configure LOW_PWR pin */
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index 177664ccb2e2..a16349272f54 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -566,7 +566,7 @@ static int cmx270_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class cmx270_pm_sysclass = {
-        set_kset_name("pm"),
+        .name = "pm",
         .resume = cmx270_resume,
         .suspend = cmx270_suspend,
 };
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index 26116440a7c9..78ebad063cba 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -122,7 +122,7 @@ static int lpd270_irq_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class lpd270_irq_sysclass = {
-        set_kset_name("cpld_irq"),
+        .name = "cpld_irq",
         .resume = lpd270_irq_resume,
 };
 
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 011a1a72b61c..1d3112dc629e 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -126,7 +126,7 @@ static int lubbock_irq_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class lubbock_irq_sysclass = {
-        set_kset_name("cpld_irq"),
+        .name = "cpld_irq",
         .resume = lubbock_irq_resume,
 };
 
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index a4bc3483cbb3..41d8c6cea62b 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -120,7 +120,7 @@ static int mainstone_irq_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class mainstone_irq_sysclass = {
-        set_kset_name("cpld_irq"),
+        .name = "cpld_irq",
         .resume = mainstone_irq_resume,
 };
 
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index e580303cb0ab..0e7991940f81 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -100,7 +100,7 @@ void __init s3c2410_init_clocks(int xtal)
 }
 
 struct sysdev_class s3c2410_sysclass = {
-        set_kset_name("s3c2410-core"),
+        .name = "s3c2410-core",
 };
 
 static struct sys_device s3c2410_sysdev = {
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c
index 4f92a1562d77..265cd3f567a3 100644
--- a/arch/arm/mach-s3c2412/s3c2412.c
+++ b/arch/arm/mach-s3c2412/s3c2412.c
@@ -196,7 +196,7 @@ void __init s3c2412_init_clocks(int xtal)
 */
 
 struct sysdev_class s3c2412_sysclass = {
-        set_kset_name("s3c2412-core"),
+        .name = "s3c2412-core",
 };
 
 static int __init s3c2412_core_init(void)
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index c326983f4a8f..78af7664988b 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -312,7 +312,7 @@ static int osiris_pm_resume(struct sys_device *sd)
 #endif
 
 static struct sysdev_class osiris_pm_sysclass = {
-        set_kset_name("mach-osiris"),
+        .name           = "mach-osiris",
         .suspend        = osiris_pm_suspend,
         .resume         = osiris_pm_resume,
 };
diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c
index 8d8117158d23..9ce490560af9 100644
--- a/arch/arm/mach-s3c2443/s3c2443.c
+++ b/arch/arm/mach-s3c2443/s3c2443.c
@@ -43,7 +43,7 @@ static struct map_desc s3c2443_iodesc[] __initdata = {
 };
 
 struct sysdev_class s3c2443_sysclass = {
-        set_kset_name("s3c2443-core"),
+        .name = "s3c2443-core",
 };
 
 static struct sys_device s3c2443_sysdev = {
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index edf3347d9c5b..3dc17d7bf38e 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -283,7 +283,7 @@ static int sa1100irq_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class sa1100irq_sysclass = {
-        set_kset_name("sa11x0-irq"),
+        .name           = "sa11x0-irq",
         .suspend        = sa1100irq_suspend,
         .resume         = sa1100irq_resume,
 };
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index a9de727c9327..0a5cf3a6438b 100644
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -96,7 +96,7 @@ static int op_arm_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class oprofile_sysclass = {
-        set_kset_name("oprofile"),
+        .name           = "oprofile",
         .resume         = op_arm_resume,
         .suspend        = op_arm_suspend,
 };
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 6097753394ad..b2a87b8ef673 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1455,7 +1455,7 @@ static int omap_gpio_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class omap_gpio_sysclass = {
-        set_kset_name("gpio"),
+        .name           = "gpio",
         .suspend        = omap_gpio_suspend,
         .resume         = omap_gpio_resume,
 };
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 29696e46ed65..aae1b9cbaf44 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1265,7 +1265,7 @@ static int s3c2410_dma_resume(struct sys_device *dev)
 #endif /* CONFIG_PM */
 
 struct sysdev_class dma_sysclass = {
-        set_kset_name("s3c24xx-dma"),
+        .name           = "s3c24xx-dma",
         .suspend        = s3c2410_dma_suspend,
         .resume         = s3c2410_dma_resume,
 };
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c
index 3444b13afac5..f197bb3a2366 100644
--- a/arch/arm/plat-s3c24xx/s3c244x.c
+++ b/arch/arm/plat-s3c24xx/s3c244x.c
@@ -151,13 +151,13 @@ static int s3c244x_resume(struct sys_device *dev)
 /* Since the S3C2442 and S3C2440 share  items, put both sysclasses here */
 
 struct sysdev_class s3c2440_sysclass = {
-        set_kset_name("s3c2440-core"),
+        .name           = "s3c2440-core",
         .suspend        = s3c244x_suspend,
         .resume         = s3c244x_resume
 };
 
 struct sysdev_class s3c2442_sysclass = {
-        set_kset_name("s3c2442-core"),
+        .name           = "s3c2442-core",
         .suspend        = s3c244x_suspend,
         .resume         = s3c244x_resume
 };
diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index 7014a3571ec0..36a46c3ae308 100644
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -214,7 +214,7 @@ void __init time_init(void)
 }
 
 static struct sysdev_class timer_class = {
-        set_kset_name("timer"),
+        .name = "timer",
 };
 
 static struct sys_device timer_device = {
diff --git a/arch/cris/arch-v32/drivers/iop_fw_load.c b/arch/cris/arch-v32/drivers/iop_fw_load.c
index 11f9895ded50..f4bdc1dfa320 100644
--- a/arch/cris/arch-v32/drivers/iop_fw_load.c
+++ b/arch/cris/arch-v32/drivers/iop_fw_load.c
@@ -20,6 +20,9 @@
 
 #define IOP_TIMEOUT 100
 
+#error "This driver is broken with regard to its driver core usage."
+#error "Please contact <greg@kroah.com> for details on how to fix it properly."
+
 static struct device iop_spu_device[2] = {
         { .bus_id =     "iop-spu0", },
         { .bus_id =     "iop-spu1", },
@@ -192,6 +195,13 @@ int iop_start_mpu(unsigned int start_addr)
 
 static int __init iop_fw_load_init(void)
 {
+#if 0
+        /*
+         * static struct devices can not be added directly to sysfs by ignoring
+         * the driver model infrastructure.  To fix this properly, please use
+         * the platform_bus to register these devices to be able to properly
+         * use the firmware infrastructure.
+         */
         device_initialize(&iop_spu_device[0]);
         kobject_set_name(&iop_spu_device[0].kobj, "iop-spu0");
         kobject_add(&iop_spu_device[0].kobj);
@@ -201,6 +211,7 @@ static int __init iop_fw_load_init(void)
         device_initialize(&iop_mpu_device);
         kobject_set_name(&iop_mpu_device.kobj, "iop-mpu");
         kobject_add(&iop_mpu_device.kobj);
+#endif
         return 0;
 }
 
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 14261fee5f4d..a2484fc1a06c 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -354,27 +354,27 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
         if (unlikely(retval < 0))
                 return retval;
 
-        all_cpu_cache_info[cpu].kobj.parent = &sys_dev->kobj;
-        kobject_set_name(&all_cpu_cache_info[cpu].kobj, "%s", "cache");
-        all_cpu_cache_info[cpu].kobj.ktype = &cache_ktype_percpu_entry;
-        retval = kobject_register(&all_cpu_cache_info[cpu].kobj);
+        retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj,
+                                      &cache_ktype_percpu_entry, &sys_dev->kobj,
+                                      "%s", "cache");
 
         for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) {
                 this_object = LEAF_KOBJECT_PTR(cpu,i);
-                this_object->kobj.parent = &all_cpu_cache_info[cpu].kobj;
-                kobject_set_name(&(this_object->kobj), "index%1lu", i);
-                this_object->kobj.ktype = &cache_ktype;
-                retval = kobject_register(&(this_object->kobj));
+                retval = kobject_init_and_add(&(this_object->kobj),
+                                              &cache_ktype,
+                                              &all_cpu_cache_info[cpu].kobj,
+                                              "index%1lu", i);
                 if (unlikely(retval)) {
                         for (j = 0; j < i; j++) {
-                                kobject_unregister(
-                                        &(LEAF_KOBJECT_PTR(cpu,j)->kobj));
+                                kobject_put(&(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);
                         break;
                 }
+                kobject_uevent(&(this_object->kobj), KOBJ_ADD);
         }
+        kobject_uevent(&all_cpu_cache_info[cpu].kobj, KOBJ_ADD);
         return retval;
 }
 
@@ -385,10 +385,10 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev)
         unsigned long 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) {
-                kobject_unregister(&all_cpu_cache_info[cpu].kobj);
+                kobject_put(&all_cpu_cache_info[cpu].kobj);
                 memset(&all_cpu_cache_info[cpu].kobj,
                         0,
                         sizeof(struct kobject));
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 471013577108..197d7977de35 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -238,7 +238,7 @@ static int i8259A_shutdown(struct sys_device *dev)
 }
 
 static struct sysdev_class i8259_sysdev_class = {
-        set_kset_name("i8259"),
+        .name = "i8259",
         .resume = i8259A_resume,
         .shutdown = i8259A_shutdown,
 };
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index c83c3e3f5178..a08862203643 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -459,7 +459,7 @@ static int spu_shutdown(struct sys_device *sysdev)
 }
 
 static struct sysdev_class spu_sysdev_class = {
-        set_kset_name("spu"),
+        .name = "spu",
         .shutdown = spu_shutdown,
 };
 
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 999f5e160897..84c0d4ef76a2 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -663,7 +663,7 @@ static int pmacpic_resume(struct sys_device *sysdev)
 #endif /* CONFIG_PM && CONFIG_PPC32 */
 
 static struct sysdev_class pmacpic_sysclass = {
-        set_kset_name("pmac_pic"),
+        .name = "pmac_pic",
 };
 
 static struct sys_device device_pmacpic = {
diff --git a/arch/powerpc/platforms/pseries/power.c b/arch/powerpc/platforms/pseries/power.c
index 73e69023d90a..e95fc1594c84 100644
--- a/arch/powerpc/platforms/pseries/power.c
+++ b/arch/powerpc/platforms/pseries/power.c
@@ -28,13 +28,15 @@
 
 unsigned long rtas_poweron_auto; /* default and normal state is 0 */
 
-static ssize_t auto_poweron_show(struct kset *kset, char *buf)
+static ssize_t auto_poweron_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr, char *buf)
 {
         return sprintf(buf, "%lu\n", rtas_poweron_auto);
 }
 
-static ssize_t
-auto_poweron_store(struct kset *kset, const char *buf, size_t n)
+static ssize_t auto_poweron_store(struct kobject *kobj,
+                                  struct kobj_attribute *attr,
+                                  const char *buf, size_t n)
 {
         int ret;
         unsigned long ups_restart;
@@ -47,17 +49,11 @@ auto_poweron_store(struct kset *kset, const char *buf, size_t n)
         return -EINVAL;
 }
 
-static struct subsys_attribute auto_poweron_attr = {
-        .attr   = {
-                .name = __stringify(auto_poweron),
-                .mode = 0644,
-        },
-        .show   = auto_poweron_show,
-        .store  = auto_poweron_store,
-};
+static struct kobj_attribute auto_poweron_attr =
+        __ATTR(auto_poweron, 0644, auto_poweron_show, auto_poweron_store);
 
 #ifndef CONFIG_PM
-decl_subsys(power,NULL,NULL);
+struct kobject *power_kobj;
 
 static struct attribute *g[] = {
         &auto_poweron_attr.attr,
@@ -70,18 +66,16 @@ static struct attribute_group attr_group = {
 
 static int __init pm_init(void)
 {
-        int error = subsystem_register(&power_subsys);
-        if (!error)
-                error = sysfs_create_group(&power_subsys.kobj, &attr_group);
-        return error;
+        power_kobj = kobject_create_and_add("power", NULL);
+        if (!power_kobj)
+                return -ENOMEM;
+        return sysfs_create_group(power_kobj, &attr_group);
 }
 core_initcall(pm_init);
 #else
-extern struct kset power_subsys;
-
 static int __init apo_pm_init(void)
 {
-        return (subsys_create_file(&power_subsys, &auto_poweron_attr));
+        return (sysfs_create_file(power_kobj, &auto_poweron_attr));
 }
 __initcall(apo_pm_init);
 #endif
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 05a56e55804c..e898ff4d2b97 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -725,7 +725,7 @@ unsigned int ipic_get_irq(void)
 }
 
 static struct sysdev_class ipic_sysclass = {
-        set_kset_name("ipic"),
+        .name = "ipic",
 };
 
 static struct sys_device device_ipic = {
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index e47938899a92..212a94f5d34b 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1584,7 +1584,7 @@ static struct sysdev_class mpic_sysclass = {
         .resume = mpic_resume,
         .suspend = mpic_suspend,
 #endif
-        set_kset_name("mpic"),
+        .name = "mpic",
 };
 
 static int mpic_init_sys(void)
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index e1c0fd6dbc1a..f59444d3be75 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -483,7 +483,7 @@ int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high)
 }
 
 static struct sysdev_class qe_ic_sysclass = {
-        set_kset_name("qe_ic"),
+        .name = "qe_ic",
 };
 
 static struct sys_device device_qe_ic = {
diff --git a/arch/ppc/syslib/ipic.c b/arch/ppc/syslib/ipic.c
index 9192777d0f78..4f163e20939e 100644
--- a/arch/ppc/syslib/ipic.c
+++ b/arch/ppc/syslib/ipic.c
@@ -614,7 +614,7 @@ int ipic_get_irq(void)
 }
 
 static struct sysdev_class ipic_sysclass = {
-        set_kset_name("ipic"),
+        .name = "ipic",
 };
 
 static struct sys_device device_ipic = {
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c
index 18ec94733293..da36522d327a 100644
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
@@ -1043,7 +1043,7 @@ int openpic_resume(struct sys_device *sysdev)
 #endif /* CONFIG_PM */
 
 static struct sysdev_class openpic_sysclass = {
-        set_kset_name("openpic"),
+        .name = "openpic",
 };
 
 static struct sys_device device_openpic = {
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c
index d585207f9f77..449075a04798 100644
--- a/arch/ppc/syslib/open_pic2.c
+++ b/arch/ppc/syslib/open_pic2.c
@@ -666,7 +666,7 @@ int openpic2_resume(struct sys_device *sysdev)
 
 /* HACK ALERT */
 static struct sysdev_class openpic2_sysclass = {
-        set_kset_name("openpic2"),
+        .name = "openpic2",
 };
 
 static struct sys_device device_openpic2 = {
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 5245717295b8..4b010ff814c9 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -490,7 +490,7 @@ static struct super_operations hypfs_s_ops = {
         .show_options   = hypfs_show_options,
 };
 
-static decl_subsys(s390, NULL, NULL);
+static struct kobject *s390_kobj;
 
 static int __init hypfs_init(void)
 {
@@ -506,17 +506,18 @@ static int __init hypfs_init(void)
                         goto fail_diag;
                 }
         }
-        kobj_set_kset_s(&s390_subsys, hypervisor_subsys);
-        rc = subsystem_register(&s390_subsys);
-        if (rc)
+        s390_kobj = kobject_create_and_add("s390", hypervisor_kobj);
+        if (!s390_kobj) {
+                rc = -ENOMEM;;
                 goto fail_sysfs;
+        }
         rc = register_filesystem(&hypfs_type);
         if (rc)
                 goto fail_filesystem;
         return 0;
 
 fail_filesystem:
-        subsystem_unregister(&s390_subsys);
+        kobject_put(s390_kobj);
 fail_sysfs:
         if (!MACHINE_IS_VM)
                 hypfs_diag_exit();
@@ -530,7 +531,7 @@ static void __exit hypfs_exit(void)
         if (!MACHINE_IS_VM)
                 hypfs_diag_exit();
         unregister_filesystem(&hypfs_type);
-        subsystem_unregister(&s390_subsys);
+        kobject_put(s390_kobj);
 }
 
 module_init(hypfs_init)
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index ce0856d32500..b97694fa62ec 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -162,22 +162,25 @@ EXPORT_SYMBOL_GPL(diag308);
 /* SYSFS */
 
 #define DEFINE_IPL_ATTR_RO(_prefix, _name, _format, _value)             \
-static ssize_t sys_##_prefix##_##_name##_show(struct kset *kset,        \
+static ssize_t sys_##_prefix##_##_name##_show(struct kobject *kobj,     \
+                struct kobj_attribute *attr,                            \
                 char *page)                                             \
 {                                                                       \
         return sprintf(page, _format, _value);                          \
 }                                                                       \
-static struct subsys_attribute sys_##_prefix##_##_name##_attr =         \
+static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
         __ATTR(_name, S_IRUGO, sys_##_prefix##_##_name##_show, NULL);
 
 #define DEFINE_IPL_ATTR_RW(_prefix, _name, _fmt_out, _fmt_in, _value)   \
-static ssize_t sys_##_prefix##_##_name##_show(struct kset *kset,        \
+static ssize_t sys_##_prefix##_##_name##_show(struct kobject *kobj,     \
+                struct kobj_attribute *attr,                            \
                 char *page)                                             \
 {                                                                       \
         return sprintf(page, _fmt_out,                                  \
                         (unsigned long long) _value);                   \
 }                                                                       \
-static ssize_t sys_##_prefix##_##_name##_store(struct kset *kset,       \
+static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj,    \
+                struct kobj_attribute *attr,                            \
                 const char *buf, size_t len)                            \
 {                                                                       \
         unsigned long long value;                                       \
@@ -186,25 +189,27 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kset *kset,	\
         _value = value;                                                 \
         return len;                                                     \
 }                                                                       \
-static struct subsys_attribute sys_##_prefix##_##_name##_attr =         \
+static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
         __ATTR(_name,(S_IRUGO | S_IWUSR),                               \
                         sys_##_prefix##_##_name##_show,                 \
                         sys_##_prefix##_##_name##_store);
 
 #define DEFINE_IPL_ATTR_STR_RW(_prefix, _name, _fmt_out, _fmt_in, _value)\
-static ssize_t sys_##_prefix##_##_name##_show(struct kset *kset,        \
+static ssize_t sys_##_prefix##_##_name##_show(struct kobject *kobj,     \
+                struct kobj_attribute *attr,                            \
                 char *page)                                             \
 {                                                                       \
         return sprintf(page, _fmt_out, _value);                         \
 }                                                                       \
-static ssize_t sys_##_prefix##_##_name##_store(struct kset *kset,       \
+static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj,    \
+                struct kobj_attribute *attr,                            \
                 const char *buf, size_t len)                            \
 {                                                                       \
         if (sscanf(buf, _fmt_in, _value) != 1)                          \
                 return -EINVAL;                                         \
         return len;                                                     \
 }                                                                       \
-static struct subsys_attribute sys_##_prefix##_##_name##_attr =         \
+static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
         __ATTR(_name,(S_IRUGO | S_IWUSR),                               \
                         sys_##_prefix##_##_name##_show,                 \
                         sys_##_prefix##_##_name##_store);
@@ -270,14 +275,16 @@ void __init setup_ipl_info(void)
 struct ipl_info ipl_info;
 EXPORT_SYMBOL_GPL(ipl_info);
 
-static ssize_t ipl_type_show(struct kset *kset, char *page)
+static ssize_t ipl_type_show(struct kobject *kobj, struct kobj_attribute *attr,
+                             char *page)
 {
         return sprintf(page, "%s\n", ipl_type_str(ipl_info.type));
 }
 
-static struct subsys_attribute sys_ipl_type_attr = __ATTR_RO(ipl_type);
+static struct kobj_attribute sys_ipl_type_attr = __ATTR_RO(ipl_type);
 
-static ssize_t sys_ipl_device_show(struct kset *kset, char *page)
+static ssize_t sys_ipl_device_show(struct kobject *kobj,
+                                   struct kobj_attribute *attr, char *page)
 {
         struct ipl_parameter_block *ipl = IPL_PARMBLOCK_START;
 
@@ -292,7 +299,7 @@ static ssize_t sys_ipl_device_show(struct kset *kset, char *page)
         }
 }
 
-static struct subsys_attribute sys_ipl_device_attr =
+static struct kobj_attribute sys_ipl_device_attr =
         __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);
 
 static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr,
@@ -367,7 +374,8 @@ static struct attribute_group ipl_fcp_attr_group = {
 
 /* CCW ipl device attributes */
 
-static ssize_t ipl_ccw_loadparm_show(struct kset *kset, char *page)
+static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj,
+                                     struct kobj_attribute *attr, char *page)
 {
         char loadparm[LOADPARM_LEN + 1] = {};
 
@@ -379,7 +387,7 @@ static ssize_t ipl_ccw_loadparm_show(struct kset *kset, char *page)
         return sprintf(page, "%s\n", loadparm);
 }
 
-static struct subsys_attribute sys_ipl_ccw_loadparm_attr =
+static struct kobj_attribute sys_ipl_ccw_loadparm_attr =
         __ATTR(loadparm, 0444, ipl_ccw_loadparm_show, NULL);
 
 static struct attribute *ipl_ccw_attrs[] = {
@@ -418,7 +426,7 @@ static struct attribute_group ipl_unknown_attr_group = {
         .attrs = ipl_unknown_attrs,
 };
 
-static decl_subsys(ipl, NULL, NULL);
+static struct kset *ipl_kset;
 
 /*
  * reipl section
@@ -465,7 +473,8 @@ static void reipl_get_ascii_loadparm(char *loadparm)
         strstrip(loadparm);
 }
 
-static ssize_t reipl_ccw_loadparm_show(struct kset *kset, char *page)
+static ssize_t reipl_ccw_loadparm_show(struct kobject *kobj,
+                                       struct kobj_attribute *attr, char *page)
 {
         char buf[LOADPARM_LEN + 1];
 
@@ -473,7 +482,8 @@ static ssize_t reipl_ccw_loadparm_show(struct kset *kset, char *page)
         return sprintf(page, "%s\n", buf);
 }
 
-static ssize_t reipl_ccw_loadparm_store(struct kset *kset,
+static ssize_t reipl_ccw_loadparm_store(struct kobject *kobj,
+                                        struct kobj_attribute *attr,
                                         const char *buf, size_t len)
 {
         int i, lp_len;
@@ -500,7 +510,7 @@ static ssize_t reipl_ccw_loadparm_store(struct kset *kset,
         return len;
 }
 
-static struct subsys_attribute sys_reipl_ccw_loadparm_attr =
+static struct kobj_attribute sys_reipl_ccw_loadparm_attr =
         __ATTR(loadparm, 0644, reipl_ccw_loadparm_show,
                reipl_ccw_loadparm_store);
 
@@ -568,13 +578,15 @@ static int reipl_set_type(enum ipl_type type)
         return 0;
 }
 
-static ssize_t reipl_type_show(struct kset *kset, char *page)
+static ssize_t reipl_type_show(struct kobject *kobj,
+                               struct kobj_attribute *attr, char *page)
 {
         return sprintf(page, "%s\n", ipl_type_str(reipl_type));
 }
 
-static ssize_t reipl_type_store(struct kset *kset, const char *buf,
-                                size_t len)
+static ssize_t reipl_type_store(struct kobject *kobj,
+                                struct kobj_attribute *attr,
+                                const char *buf, size_t len)
 {
         int rc = -EINVAL;
 
@@ -587,10 +599,10 @@ static ssize_t reipl_type_store(struct kset *kset, const char *buf,
         return (rc != 0) ? rc : len;
 }
 
-static struct subsys_attribute reipl_type_attr =
+static struct kobj_attribute reipl_type_attr =
                 __ATTR(reipl_type, 0644, reipl_type_show, reipl_type_store);
 
-static decl_subsys(reipl, NULL, NULL);
+static struct kset *reipl_kset;
 
 /*
  * dump section
@@ -663,13 +675,15 @@ static int dump_set_type(enum dump_type type)
         return 0;
 }
 
-static ssize_t dump_type_show(struct kset *kset, char *page)
+static ssize_t dump_type_show(struct kobject *kobj,
+                              struct kobj_attribute *attr, char *page)
 {
         return sprintf(page, "%s\n", dump_type_str(dump_type));
 }
 
-static ssize_t dump_type_store(struct kset *kset, const char *buf,
-                               size_t len)
+static ssize_t dump_type_store(struct kobject *kobj,
+                               struct kobj_attribute *attr,
+                               const char *buf, size_t len)
 {
         int rc = -EINVAL;
 
@@ -682,26 +696,28 @@ static ssize_t dump_type_store(struct kset *kset, const char *buf,
         return (rc != 0) ? rc : len;
 }
 
-static struct subsys_attribute dump_type_attr =
+static struct kobj_attribute dump_type_attr =
                 __ATTR(dump_type, 0644, dump_type_show, dump_type_store);
 
-static decl_subsys(dump, NULL, NULL);
+static struct kset *dump_kset;
 
 /*
  * Shutdown actions section
  */
 
-static decl_subsys(shutdown_actions, NULL, NULL);
+static struct kset *shutdown_actions_kset;
 
 /* on panic */
 
-static ssize_t on_panic_show(struct kset *kset, char *page)
+static ssize_t on_panic_show(struct kobject *kobj,
+                             struct kobj_attribute *attr, char *page)
 {
         return sprintf(page, "%s\n", shutdown_action_str(on_panic_action));
 }
 
-static ssize_t on_panic_store(struct kset *kset, const char *buf,
-                              size_t len)
+static ssize_t on_panic_store(struct kobject *kobj,
+                              struct kobj_attribute *attr,
+                              const char *buf, size_t len)
 {
         if (strncmp(buf, SHUTDOWN_REIPL_STR, strlen(SHUTDOWN_REIPL_STR)) == 0)
                 on_panic_action = SHUTDOWN_REIPL;
@@ -717,7 +733,7 @@ static ssize_t on_panic_store(struct kset *kset, const char *buf,
         return len;
 }
 
-static struct subsys_attribute on_panic_attr =
+static struct kobj_attribute on_panic_attr =
                 __ATTR(on_panic, 0644, on_panic_show, on_panic_store);
 
 void do_reipl(void)
@@ -814,23 +830,23 @@ static int __init ipl_register_fcp_files(void)
 {
         int rc;
 
-        rc = sysfs_create_group(&ipl_subsys.kobj,
+        rc = sysfs_create_group(&ipl_kset->kobj,
                                 &ipl_fcp_attr_group);
         if (rc)
                 goto out;
-        rc = sysfs_create_bin_file(&ipl_subsys.kobj,
+        rc = sysfs_create_bin_file(&ipl_kset->kobj,
                                    &ipl_parameter_attr);
         if (rc)
                 goto out_ipl_parm;
-        rc = sysfs_create_bin_file(&ipl_subsys.kobj,
+        rc = sysfs_create_bin_file(&ipl_kset->kobj,
                                    &ipl_scp_data_attr);
         if (!rc)
                 goto out;
 
-        sysfs_remove_bin_file(&ipl_subsys.kobj, &ipl_parameter_attr);
+        sysfs_remove_bin_file(&ipl_kset->kobj, &ipl_parameter_attr);
 
 out_ipl_parm:
-        sysfs_remove_group(&ipl_subsys.kobj, &ipl_fcp_attr_group);
+        sysfs_remove_group(&ipl_kset->kobj, &ipl_fcp_attr_group);
 out:
         return rc;
 }
@@ -839,12 +855,12 @@ static int __init ipl_init(void)
 {
         int rc;
 
-        rc = firmware_register(&ipl_subsys);
-        if (rc)
-                return rc;
+        ipl_kset = kset_create_and_add("ipl", NULL, firmware_kobj);
+        if (!ipl_kset)
+                return -ENOMEM;
         switch (ipl_info.type) {
         case IPL_TYPE_CCW:
-                rc = sysfs_create_group(&ipl_subsys.kobj,
+                rc = sysfs_create_group(&ipl_kset->kobj,
                                         &ipl_ccw_attr_group);
                 break;
         case IPL_TYPE_FCP:
@@ -852,16 +868,16 @@ static int __init ipl_init(void)
                 rc = ipl_register_fcp_files();
                 break;
         case IPL_TYPE_NSS:
-                rc = sysfs_create_group(&ipl_subsys.kobj,
+                rc = sysfs_create_group(&ipl_kset->kobj,
                                         &ipl_nss_attr_group);
                 break;
         default:
-                rc = sysfs_create_group(&ipl_subsys.kobj,
+                rc = sysfs_create_group(&ipl_kset->kobj,
                                         &ipl_unknown_attr_group);
                 break;
         }
         if (rc)
-                firmware_unregister(&ipl_subsys);
+                kset_unregister(ipl_kset);
         return rc;
 }
 
@@ -883,7 +899,7 @@ static int __init reipl_nss_init(void)
 
         if (!MACHINE_IS_VM)
                 return 0;
-        rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_nss_attr_group);
+        rc = sysfs_create_group(&reipl_kset->kobj, &reipl_nss_attr_group);
         if (rc)
                 return rc;
         strncpy(reipl_nss_name, kernel_nss_name, NSS_NAME_SIZE + 1);
@@ -898,7 +914,7 @@ static int __init reipl_ccw_init(void)
         reipl_block_ccw = (void *) get_zeroed_page(GFP_KERNEL);
         if (!reipl_block_ccw)
                 return -ENOMEM;
-        rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_ccw_attr_group);
+        rc = sysfs_create_group(&reipl_kset->kobj, &reipl_ccw_attr_group);
         if (rc) {
                 free_page((unsigned long)reipl_block_ccw);
                 return rc;
@@ -936,7 +952,7 @@ static int __init reipl_fcp_init(void)
         reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
         if (!reipl_block_fcp)
                 return -ENOMEM;
-        rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_fcp_attr_group);
+        rc = sysfs_create_group(&reipl_kset->kobj, &reipl_fcp_attr_group);
         if (rc) {
                 free_page((unsigned long)reipl_block_fcp);
                 return rc;
@@ -958,12 +974,12 @@ static int __init reipl_init(void)
 {
         int rc;
 
-        rc = firmware_register(&reipl_subsys);
-        if (rc)
-                return rc;
-        rc = subsys_create_file(&reipl_subsys, &reipl_type_attr);
+        reipl_kset = kset_create_and_add("reipl", NULL, firmware_kobj);
+        if (!reipl_kset)
+                return -ENOMEM;
+        rc = sysfs_create_file(&reipl_kset->kobj, &reipl_type_attr.attr);
         if (rc) {
-                firmware_unregister(&reipl_subsys);
+                kset_unregister(reipl_kset);
                 return rc;
         }
         rc = reipl_ccw_init();
@@ -988,7 +1004,7 @@ static int __init dump_ccw_init(void)
         dump_block_ccw = (void *) get_zeroed_page(GFP_KERNEL);
         if (!dump_block_ccw)
                 return -ENOMEM;
-        rc = sysfs_create_group(&dump_subsys.kobj, &dump_ccw_attr_group);
+        rc = sysfs_create_group(&dump_kset->kobj, &dump_ccw_attr_group);
         if (rc) {
                 free_page((unsigned long)dump_block_ccw);
                 return rc;
@@ -1012,7 +1028,7 @@ static int __init dump_fcp_init(void)
         dump_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
         if (!dump_block_fcp)
                 return -ENOMEM;
-        rc = sysfs_create_group(&dump_subsys.kobj, &dump_fcp_attr_group);
+        rc = sysfs_create_group(&dump_kset->kobj, &dump_fcp_attr_group);
         if (rc) {
                 free_page((unsigned long)dump_block_fcp);
                 return rc;
@@ -1047,12 +1063,12 @@ static int __init dump_init(void)
 {
         int rc;
 
-        rc = firmware_register(&dump_subsys);
-        if (rc)
-                return rc;
-        rc = subsys_create_file(&dump_subsys, &dump_type_attr);
+        dump_kset = kset_create_and_add("dump", NULL, firmware_kobj);
+        if (!dump_kset)
+                return -ENOMEM;
+        rc = sysfs_create_file(&dump_kset->kobj, &dump_type_attr);
         if (rc) {
-                firmware_unregister(&dump_subsys);
+                kset_unregister(dump_kset);
                 return rc;
         }
         rc = dump_ccw_init();
@@ -1069,12 +1085,13 @@ static int __init shutdown_actions_init(void)
 {
         int rc;
 
-        rc = firmware_register(&shutdown_actions_subsys);
-        if (rc)
-                return rc;
-        rc = subsys_create_file(&shutdown_actions_subsys, &on_panic_attr);
+        shutdown_actions_kset = kset_create_and_add("shutdown_actions", NULL,
+                                                    firmware_kobj);
+        if (!shutdown_actions_kset)
+                return -ENOMEM;
+        rc = sysfs_create_file(&shutdown_actions_kset->kobj, &on_panic_attr);
         if (rc) {
-                firmware_unregister(&shutdown_actions_subsys);
+                kset_unregister(shutdown_actions_kset);
                 return rc;
         }
         atomic_notifier_chain_register(&panic_notifier_list,
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 22b800ce2126..3bbac1293be4 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -1145,7 +1145,7 @@ static void etr_work_fn(struct work_struct *work)
  * Sysfs interface functions
  */
 static struct sysdev_class etr_sysclass = {
-        set_kset_name("etr")
+        .name   = "etr",
 };
 
 static struct sys_device etr_port0_dev = {
diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c
index eebcd4768bbf..51b57c0d1a3c 100644
--- a/arch/sh/drivers/dma/dma-sysfs.c
+++ b/arch/sh/drivers/dma/dma-sysfs.c
@@ -19,7 +19,7 @@
 #include <asm/dma.h>
 
 static struct sysdev_class dma_sysclass = {
-        set_kset_name("dma"),
+        .name = "dma",
 };
 EXPORT_SYMBOL(dma_sysclass);
 
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index b22a78c807e6..3008c00eea6b 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -341,17 +341,18 @@ static int __devinit sq_sysdev_add(struct sys_device *sysdev)
 {
         unsigned int cpu = sysdev->id;
         struct kobject *kobj;
+        int error;
 
         sq_kobject[cpu] = kzalloc(sizeof(struct kobject), GFP_KERNEL);
         if (unlikely(!sq_kobject[cpu]))
                 return -ENOMEM;
 
         kobj = sq_kobject[cpu];
-        kobj->parent = &sysdev->kobj;
-        kobject_set_name(kobj, "%s", "sq");
-        kobj->ktype = &ktype_percpu_entry;
-
-        return kobject_register(kobj);
+        error = kobject_init_and_add(kobj, &ktype_percpu_entry, &sysdev->kobj,
+                                     "%s", "sq");
+        if (!error)
+                kobject_uevent(kobj, KOBJ_ADD);
+        return error;
 }
 
 static int __devexit sq_sysdev_remove(struct sys_device *sysdev)
@@ -359,7 +360,7 @@ static int __devexit sq_sysdev_remove(struct sys_device *sysdev)
         unsigned int cpu = sysdev->id;
         struct kobject *kobj = sq_kobject[cpu];
 
-        kobject_unregister(kobj);
+        kobject_put(kobj);
         return 0;
 }
 
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index a3a67d151e52..2bc04bfee738 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -174,7 +174,7 @@ int timer_resume(struct sys_device *dev)
 #endif
 
 static struct sysdev_class timer_sysclass = {
-        set_kset_name("timer"),
+        .name    = "timer",
         .suspend = timer_suspend,
         .resume  = timer_resume,
 };
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,
 };