Merge branch 'driver-core-next' into Linux 3.2

This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

134 files changed, 1350 insertions, 1285 deletions

diff --git a/arch/arm/include/asm/mach/time.h b/arch/arm/include/asm/mach/time.h
index d5adaae5ee2c..f73c908b7fa0 100644
--- a/arch/arm/include/asm/mach/time.h
+++ b/arch/arm/include/asm/mach/time.h
@@ -10,8 +10,6 @@
 #ifndef __ASM_ARM_MACH_TIME_H
 #define __ASM_ARM_MACH_TIME_H
 
-#include <linux/sysdev.h>
-
 /*
  * This is our kernel timer structure.
  *
diff --git a/arch/arm/kernel/leds.c b/arch/arm/kernel/leds.c
index 0bcd38341573..1911dae19e4f 100644
--- a/arch/arm/kernel/leds.c
+++ b/arch/arm/kernel/leds.c
@@ -9,7 +9,7 @@
  */
 #include <linux/export.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/string.h>
 
@@ -34,8 +34,8 @@ static const struct leds_evt_name evt_names[] = {
         { "red",   led_red_on,   led_red_off   },
 };
 
-static ssize_t leds_store(struct sys_device *dev,
-                        struct sysdev_attribute *attr,
+static ssize_t leds_store(struct device *dev,
+                        struct device_attribute *attr,
                         const char *buf, size_t size)
 {
         int ret = -EINVAL, len = strcspn(buf, " ");
@@ -69,15 +69,16 @@ static ssize_t leds_store(struct sys_device *dev,
         return ret;
 }
 
-static SYSDEV_ATTR(event, 0200, NULL, leds_store);
+static DEVICE_ATTR(event, 0200, NULL, leds_store);
 
-static struct sysdev_class leds_sysclass = {
+static struct bus_type leds_subsys = {
         .name           = "leds",
+        .dev_name       = "leds",
 };
 
-static struct sys_device leds_device = {
+static struct device leds_device = {
         .id             = 0,
-        .cls            = &leds_sysclass,
+        .bus            = &leds_subsys,
 };
 
 static int leds_suspend(void)
@@ -105,11 +106,11 @@ static struct syscore_ops leds_syscore_ops = {
 static int __init leds_init(void)
 {
         int ret;
-        ret = sysdev_class_register(&leds_sysclass);
+        ret = subsys_system_register(&leds_subsys, NULL);
         if (ret == 0)
-                ret = sysdev_register(&leds_device);
+                ret = device_register(&leds_device);
         if (ret == 0)
-                ret = sysdev_create_file(&leds_device, &attr_event);
+                ret = device_create_file(&leds_device, &dev_attr_event);
         if (ret == 0)
                 register_syscore_ops(&leds_syscore_ops);
         return ret;
diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c
index 430da120a297..6b67b7e8426c 100644
--- a/arch/arm/mach-bcmring/core.c
+++ b/arch/arm/mach-bcmring/core.c
@@ -25,7 +25,6 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/amba/bus.h>
 #include <linux/clkdev.h>
diff --git a/arch/arm/mach-exynos/cpu.c b/arch/arm/mach-exynos/cpu.c
index cc8d4bd6d0f7..90a0297b77b8 100644
--- a/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@ -9,7 +9,7 @@
 */
 
 #include <linux/sched.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
@@ -238,17 +238,18 @@ void __init exynos4_init_irq(void)
         s5p_init_irq(NULL, 0);
 }
 
-struct sysdev_class exynos4_sysclass = {
-        .name   = "exynos4-core",
+struct bus_type exynos4_subsys = {
+        .name           = "exynos4-core",
+        .dev_name       = "exynos4-core",
 };
 
-static struct sys_device exynos4_sysdev = {
-        .cls    = &exynos4_sysclass,
+static struct device exynos4_dev = {
+        .bus    = &exynos4_subsys,
 };
 
 static int __init exynos4_core_init(void)
 {
-        return sysdev_class_register(&exynos4_sysclass);
+        return subsys_system_register(&exynos4_subsys, NULL);
 }
 core_initcall(exynos4_core_init);
 
@@ -289,5 +290,5 @@ int __init exynos_init(void)
         if (soc_is_exynos4210() || soc_is_exynos4212() || soc_is_exynos4412())
                 s5p_reset_hook = exynos4_sw_reset;
 
-        return sysdev_register(&exynos4_sysdev);
+        return device_register(&exynos4_dev);
 }
diff --git a/arch/arm/mach-exynos/irq-eint.c b/arch/arm/mach-exynos/irq-eint.c
index badb8c66fc9b..fe461901d60f 100644
--- a/arch/arm/mach-exynos/irq-eint.c
+++ b/arch/arm/mach-exynos/irq-eint.c
@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/gpio.h>
 
 #include <plat/pm.h>
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index 509a435afd4b..c4f792dcad19 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -205,7 +205,7 @@ static void exynos4_pm_prepare(void)
 
 }
 
-static int exynos4_pm_add(struct sys_device *sysdev)
+static int exynos4_pm_add(struct device *dev)
 {
         pm_cpu_prep = exynos4_pm_prepare;
         pm_cpu_sleep = exynos4_cpu_suspend;
@@ -301,8 +301,10 @@ static void exynos4_restore_pll(void)
         } while (epll_wait || vpll_wait);
 }
 
-static struct sysdev_driver exynos4_pm_driver = {
-        .add            = exynos4_pm_add,
+static struct subsys_interface exynos4_pm_interface = {
+        .name           = "exynos4_pm",
+        .subsys         = &exynos4_subsys,
+        .add_dev        = exynos4_pm_add,
 };
 
 static __init int exynos4_pm_drvinit(void)
@@ -325,7 +327,7 @@ static __init int exynos4_pm_drvinit(void)
                 clk_put(pll_base);
         }
 
-        return sysdev_driver_register(&exynos4_sysclass, &exynos4_pm_driver);
+        return subsys_interface_register(&exynos4_pm_interface);
 }
 arch_initcall(exynos4_pm_drvinit);
 
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 5de49c33e4d4..208545c53da6 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/string.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/kmi.h>
 #include <linux/amba/clcd.h>
diff --git a/arch/arm/mach-ks8695/irq.c b/arch/arm/mach-ks8695/irq.c
index a78092dcd6fb..76802aac0f45 100644
--- a/arch/arm/mach-ks8695/irq.c
+++ b/arch/arm/mach-ks8695/irq.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index 6d2f0d1b9373..21f3d4b9ee85 100644
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -18,7 +18,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/dma-mapping.h>
diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c
index 32b465763dbd..97b8191d9d38 100644
--- a/arch/arm/mach-msm/board-sapphire.c
+++ b/arch/arm/mach-msm/board-sapphire.c
@@ -18,7 +18,7 @@
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index d5ed5d4f77d6..acd329afc3ac 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -21,7 +21,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 026c66ad7ec2..af608f76e0a7 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -21,7 +21,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl061.h>
 #include <linux/amba/mmci.h>
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index c057540ec776..510424669d0e 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -21,7 +21,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl061.h>
 #include <linux/amba/mmci.h>
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 671ad6d6ff00..70d1bbdf2a3e 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -21,7 +21,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl061.h>
 #include <linux/amba/mmci.h>
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index cbf22df4ad5b..b841fc0a75dc 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -21,7 +21,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl061.h>
 #include <linux/amba/mmci.h>
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 63c4114afae9..e102120fc6ac 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -20,7 +20,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl061.h>
 #include <linux/amba/mmci.h>
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index bc53d2d16d1a..ac7b2ad5c405 100644
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -24,7 +24,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-s3c2410/cpu-freq.c b/arch/arm/mach-s3c2410/cpu-freq.c
index 75189df995ae..7dc6c46b5e2b 100644
--- a/arch/arm/mach-s3c2410/cpu-freq.c
+++ b/arch/arm/mach-s3c2410/cpu-freq.c
@@ -16,7 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/cpufreq.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
@@ -115,24 +115,25 @@ static struct s3c_cpufreq_info s3c2410_cpufreq_info = {
         .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),
 };
 
-static int s3c2410_cpufreq_add(struct sys_device *sysdev)
+static int s3c2410_cpufreq_add(struct device *dev)
 {
         return s3c_cpufreq_register(&s3c2410_cpufreq_info);
 }
 
-static struct sysdev_driver s3c2410_cpufreq_driver = {
-        .add            = s3c2410_cpufreq_add,
+static struct subsys_interface s3c2410_cpufreq_interface = {
+        .name           = "s3c2410_cpufreq",
+        .subsys         = &s3c2410_subsys,
+        .add_dev        = s3c2410_cpufreq_add,
 };
 
 static int __init s3c2410_cpufreq_init(void)
 {
-        return sysdev_driver_register(&s3c2410_sysclass,
-                                      &s3c2410_cpufreq_driver);
+        return subsys_interface_register(&s3c2410_cpufreq_interface);
 }
 
 arch_initcall(s3c2410_cpufreq_init);
 
-static int s3c2410a_cpufreq_add(struct sys_device *sysdev)
+static int s3c2410a_cpufreq_add(struct device *dev)
 {
         /* alter the maximum freq settings for S3C2410A. If a board knows
          * it only has a maximum of 200, then it should register its own
@@ -143,17 +144,18 @@ static int s3c2410a_cpufreq_add(struct sys_device *sysdev)
         s3c2410_cpufreq_info.max.pclk =  66500000;
         s3c2410_cpufreq_info.name = "s3c2410a";
 
-        return s3c2410_cpufreq_add(sysdev);
+        return s3c2410_cpufreq_add(dev);
 }
 
-static struct sysdev_driver s3c2410a_cpufreq_driver = {
-        .add            = s3c2410a_cpufreq_add,
+static struct subsys_interface s3c2410a_cpufreq_interface = {
+        .name           = "s3c2410a_cpufreq",
+        .subsys         = &s3c2410a_subsys,
+        .add_dev        = s3c2410a_cpufreq_add,
 };
 
 static int __init s3c2410a_cpufreq_init(void)
 {
-        return sysdev_driver_register(&s3c2410a_sysclass,
-                                      &s3c2410a_cpufreq_driver);
+        return subsys_interface_register(&s3c2410a_cpufreq_interface);
 }
 
 arch_initcall(s3c2410a_cpufreq_init);
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
index dbe43df8cfec..2afd00014a77 100644
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
@@ -14,7 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 
 #include <mach/map.h>
@@ -132,7 +132,7 @@ static struct s3c24xx_dma_order __initdata s3c2410_dma_order = {
         },
 };
 
-static int __init s3c2410_dma_add(struct sys_device *sysdev)
+static int __init s3c2410_dma_add(struct device *dev)
 {
         s3c2410_dma_init();
         s3c24xx_dma_order_set(&s3c2410_dma_order);
@@ -140,24 +140,28 @@ static int __init s3c2410_dma_add(struct sys_device *sysdev)
 }
 
 #if defined(CONFIG_CPU_S3C2410)
-static struct sysdev_driver s3c2410_dma_driver = {
-        .add    = s3c2410_dma_add,
+static struct subsys_interface s3c2410_dma_interface = {
+        .name           = "s3c2410_dma",
+        .subsys         = &s3c2410_subsys,
+        .add_dev        = s3c2410_dma_add,
 };
 
 static int __init s3c2410_dma_drvinit(void)
 {
-        return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_dma_driver);
+        return subsys_interface_register(&s3c2410_interface);
 }
 
 arch_initcall(s3c2410_dma_drvinit);
 
-static struct sysdev_driver s3c2410a_dma_driver = {
-        .add    = s3c2410_dma_add,
+static struct subsys_interface s3c2410a_dma_interface = {
+        .name           = "s3c2410a_dma",
+        .subsys         = &s3c2410a_subsys,
+        .add_dev        = s3c2410_dma_add,
 };
 
 static int __init s3c2410a_dma_drvinit(void)
 {
-        return sysdev_driver_register(&s3c2410a_sysclass, &s3c2410a_dma_driver);
+        return subsys_interface_register(&s3c2410a_dma_interface);
 }
 
 arch_initcall(s3c2410a_dma_drvinit);
@@ -165,13 +169,15 @@ arch_initcall(s3c2410a_dma_drvinit);
 
 #if defined(CONFIG_CPU_S3C2442)
 /* S3C2442 DMA contains the same selection table as the S3C2410 */
-static struct sysdev_driver s3c2442_dma_driver = {
-        .add    = s3c2410_dma_add,
+static struct subsys_interface s3c2442_dma_interface = {
+        .name           = "s3c2442_dma",
+        .subsys         = &s3c2442_subsys,
+        .add_dev        = s3c2410_dma_add,
 };
 
 static int __init s3c2442_dma_drvinit(void)
 {
-        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_dma_driver);
+        return subsys_interface_register(&s3c2442_dma_interface);
 }
 
 arch_initcall(s3c2442_dma_drvinit);
diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h
index ae8e482b6427..acbdfecd4186 100644
--- a/arch/arm/mach-s3c2410/include/mach/dma.h
+++ b/arch/arm/mach-s3c2410/include/mach/dma.h
@@ -13,7 +13,7 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H __FILE__
 
-#include <linux/sysdev.h>
+#include <linux/device.h>
 
 #define MAX_DMA_TRANSFER_SIZE   0x100000 /* Data Unit is half word  */
 
@@ -202,7 +202,7 @@ struct s3c2410_dma_chan {
         struct s3c2410_dma_buf  *end;           /* end of queue */
 
         /* system device */
-        struct sys_device       dev;
+        struct device   dev;
 };
 
 typedef unsigned long dma_device_t;
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 05a7d16e59f5..837a2d6f3524 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -18,7 +18,7 @@
 #include <linux/memblock.h>
 #include <linux/timer.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index 451852156254..6f69789943d5 100644
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -28,7 +28,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
 #include <linux/spi/spi.h>
diff --git a/arch/arm/mach-s3c2410/pll.c b/arch/arm/mach-s3c2410/pll.c
index 8338865e11c0..c07438bfc99f 100644
--- a/arch/arm/mach-s3c2410/pll.c
+++ b/arch/arm/mach-s3c2410/pll.c
@@ -25,7 +25,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/list.h>
 #include <linux/clk.h>
 #include <linux/err.h>
@@ -66,30 +66,34 @@ static struct cpufreq_frequency_table pll_vals_12MHz[] = {
     { .frequency = 270000000, .index = PLLVAL(127, 1, 1),  },
 };
 
-static int s3c2410_plls_add(struct sys_device *dev)
+static int s3c2410_plls_add(struct device *dev)
 {
         return s3c_plltab_register(pll_vals_12MHz, ARRAY_SIZE(pll_vals_12MHz));
 }
 
-static struct sysdev_driver s3c2410_plls_drv = {
-        .add    = s3c2410_plls_add,
+static struct subsys_interface s3c2410_plls_interface = {
+        .name           = "s3c2410_plls",
+        .subsys         = &s3c2410_subsys,
+        .add_dev        = s3c2410_plls_add,
 };
 
 static int __init s3c2410_pll_init(void)
 {
-        return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_plls_drv);
+        return subsys_interface_register(&s3c2410_plls_interface);
 
 }
 
 arch_initcall(s3c2410_pll_init);
 
-static struct sysdev_driver s3c2410a_plls_drv = {
-        .add    = s3c2410_plls_add,
+static struct subsys_interface s3c2410a_plls_interface = {
+        .name           = "s3c2410a_plls",
+        .subsys         = &s3c2410a_subsys,
+        .add_dev        = s3c2410_plls_add,
 };
 
 static int __init s3c2410a_pll_init(void)
 {
-        return sysdev_driver_register(&s3c2410a_sysclass, &s3c2410a_plls_drv);
+        return subsys_interface_register(&s3c2410a_plls_interface);
 }
 
 arch_initcall(s3c2410a_pll_init);
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index 4728f9aa7df1..fda5385deff6 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -24,7 +24,7 @@
 #include <linux/suspend.h>
 #include <linux/errno.h>
 #include <linux/time.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
@@ -111,7 +111,7 @@ struct syscore_ops s3c2410_pm_syscore_ops = {
         .resume         = s3c2410_pm_resume,
 };
 
-static int s3c2410_pm_add(struct sys_device *dev)
+static int s3c2410_pm_add(struct device *dev)
 {
         pm_cpu_prep = s3c2410_pm_prepare;
         pm_cpu_sleep = s3c2410_cpu_suspend;
@@ -120,52 +120,60 @@ static int s3c2410_pm_add(struct sys_device *dev)
 }
 
 #if defined(CONFIG_CPU_S3C2410)
-static struct sysdev_driver s3c2410_pm_driver = {
-        .add            = s3c2410_pm_add,
+static struct subsys_interface s3c2410_pm_interface = {
+        .name           = "s3c2410_pm",
+        .subsys         = &s3c2410_subsys,
+        .add_dev        = s3c2410_pm_add,
 };
 
 /* register ourselves */
 
 static int __init s3c2410_pm_drvinit(void)
 {
-        return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_pm_driver);
+        return subsys_interface_register(&s3c2410_pm_interface);
 }
 
 arch_initcall(s3c2410_pm_drvinit);
 
-static struct sysdev_driver s3c2410a_pm_driver = {
-        .add            = s3c2410_pm_add,
+static struct subsys_interface s3c2410a_pm_interface = {
+        .name           = "s3c2410a_pm",
+        .subsys         = &s3c2410a_subsys,
+        .add_dev        = s3c2410_pm_add,
 };
 
 static int __init s3c2410a_pm_drvinit(void)
 {
-        return sysdev_driver_register(&s3c2410a_sysclass, &s3c2410a_pm_driver);
+        return subsys_interface_register(&s3c2410a_pm_interface);
 }
 
 arch_initcall(s3c2410a_pm_drvinit);
 #endif
 
 #if defined(CONFIG_CPU_S3C2440)
-static struct sysdev_driver s3c2440_pm_driver = {
-        .add            = s3c2410_pm_add,
+static struct subsys_interface s3c2440_pm_interface = {
+        .name           = "s3c2440_pm",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c2410_pm_add,
 };
 
 static int __init s3c2440_pm_drvinit(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_pm_driver);
+        return subsys_interface_register(&s3c2440_pm_interface);
 }
 
 arch_initcall(s3c2440_pm_drvinit);
 #endif
 
 #if defined(CONFIG_CPU_S3C2442)
-static struct sysdev_driver s3c2442_pm_driver = {
-        .add            = s3c2410_pm_add,
+static struct subsys_interface s3c2442_pm_interface = {
+        .name           = "s3c2442_pm",
+        .subsys         = &s3c2442_subsys,
+        .add_dev        = s3c2410_pm_add,
 };
 
 static int __init s3c2442_pm_drvinit(void)
 {
-        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_pm_driver);
+        return subsys_interface_register(&s3c2442_pm_interface);
 }
 
 arch_initcall(s3c2442_pm_drvinit);
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index 3d7ebc557a72..da6651556eb9 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
@@ -131,22 +131,24 @@ void __init s3c2410_init_clocks(int xtal)
         s3c24xx_register_clock(&s3c2410_armclk);
 }
 
-struct sysdev_class s3c2410_sysclass = {
+struct bus_type s3c2410_subsys = {
         .name = "s3c2410-core",
+        .dev_name = "s3c2410-core",
 };
 
 /* Note, we would have liked to name this s3c2410-core, but we cannot
- * register two sysdev_class with the same name.
+ * register two subsystems with the same name.
  */
-struct sysdev_class s3c2410a_sysclass = {
+struct bus_type s3c2410a_subsys = {
         .name = "s3c2410a-core",
+        .dev_name = "s3c2410a-core",
 };
 
-static struct sys_device s3c2410_sysdev = {
-        .cls            = &s3c2410_sysclass,
+static struct device s3c2410_dev = {
+        .bus            = &s3c2410_subsys,
 };
 
-/* need to register class before we actually register the device, and
+/* need to register the subsystem before we actually register the device, and
  * we also need to ensure that it has been initialised before any of the
  * drivers even try to use it (even if not on an s3c2410 based system)
  * as a driver which may support both 2410 and 2440 may try and use it.
@@ -154,14 +156,14 @@ static struct sys_device s3c2410_sysdev = {
 
 static int __init s3c2410_core_init(void)
 {
-        return sysdev_class_register(&s3c2410_sysclass);
+        return subsys_system_register(&s3c2410_subsys, NULL);
 }
 
 core_initcall(s3c2410_core_init);
 
 static int __init s3c2410a_core_init(void)
 {
-        return sysdev_class_register(&s3c2410a_sysclass);
+        return subsys_system_register(&s3c2410a_subsys, NULL);
 }
 
 core_initcall(s3c2410a_core_init);
@@ -175,11 +177,11 @@ int __init s3c2410_init(void)
 #endif
         register_syscore_ops(&s3c24xx_irq_syscore_ops);
 
-        return sysdev_register(&s3c2410_sysdev);
+        return device_register(&s3c2410_dev);
 }
 
 int __init s3c2410a_init(void)
 {
-        s3c2410_sysdev.cls = &s3c2410a_sysclass;
+        s3c2410_dev.bus = &s3c2410a_subsys;
         return s3c2410_init();
 }
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c
index 140711db6c89..516881640808 100644
--- a/arch/arm/mach-s3c2412/clock.c
+++ b/arch/arm/mach-s3c2412/clock.c
@@ -26,7 +26,7 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/mutex.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-s3c2412/cpu-freq.c b/arch/arm/mach-s3c2412/cpu-freq.c
index eb3ea1721335..d8664b7652ce 100644
--- a/arch/arm/mach-s3c2412/cpu-freq.c
+++ b/arch/arm/mach-s3c2412/cpu-freq.c
@@ -16,7 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/cpufreq.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/err.h>
@@ -194,7 +194,7 @@ static struct s3c_cpufreq_info s3c2412_cpufreq_info = {
         .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2412_iotiming_debugfs),
 };
 
-static int s3c2412_cpufreq_add(struct sys_device *sysdev)
+static int s3c2412_cpufreq_add(struct device *dev)
 {
         unsigned long fclk_rate;
 
@@ -244,14 +244,15 @@ err_fclk:
         return -ENOENT;
 }
 
-static struct sysdev_driver s3c2412_cpufreq_driver = {
-        .add            = s3c2412_cpufreq_add,
+static struct subsys_interface s3c2412_cpufreq_interface = {
+        .name           = "s3c2412_cpufreq",
+        .subsys         = &s3c2412_subsys,
+        .add_dev        = s3c2412_cpufreq_add,
 };
 
 static int s3c2412_cpufreq_init(void)
 {
-        return sysdev_driver_register(&s3c2412_sysclass,
-                                      &s3c2412_cpufreq_driver);
+        return subsys_interface_register(&s3c2412_cpufreq_interface);
 }
 
 arch_initcall(s3c2412_cpufreq_init);
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c
index d2a7d5ef3e67..142acd3b5e15 100644
--- a/arch/arm/mach-s3c2412/dma.c
+++ b/arch/arm/mach-s3c2412/dma.c
@@ -14,7 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/io.h>
 
@@ -159,19 +159,21 @@ static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = {
         .map_size       = ARRAY_SIZE(s3c2412_dma_mappings),
 };
 
-static int __init s3c2412_dma_add(struct sys_device *sysdev)
+static int __init s3c2412_dma_add(struct device *dev)
 {
         s3c2410_dma_init();
         return s3c24xx_dma_init_map(&s3c2412_dma_sel);
 }
 
-static struct sysdev_driver s3c2412_dma_driver = {
-        .add    = s3c2412_dma_add,
+static struct subsys_interface s3c2412_dma_interface = {
+        .name           = "s3c2412_dma",
+        .subsys         = &s3c2412_subsys,
+        .add_dev        = s3c2412_dma_add,
 };
 
 static int __init s3c2412_dma_init(void)
 {
-        return sysdev_driver_register(&s3c2412_sysclass, &s3c2412_dma_driver);
+        return subsys_interface_register(&s3c2412_dma_interface);
 }
 
 arch_initcall(s3c2412_dma_init);
diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c
index 1a1aa220972b..a8a46c1644f4 100644
--- a/arch/arm/mach-s3c2412/irq.c
+++ b/arch/arm/mach-s3c2412/irq.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -170,7 +170,7 @@ static int s3c2412_irq_rtc_wake(struct irq_data *data, unsigned int state)
 
 static struct irq_chip s3c2412_irq_rtc_chip;
 
-static int s3c2412_irq_add(struct sys_device *sysdev)
+static int s3c2412_irq_add(struct device *dev)
 {
         unsigned int irqno;
 
@@ -200,13 +200,15 @@ static int s3c2412_irq_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2412_irq_driver = {
-        .add            = s3c2412_irq_add,
+static struct subsys_interface s3c2412_irq_interface = {
+        .name           = "s3c2412_irq",
+        .subsys         = &s3c2412_subsys,
+        .add_dev        = s3c2412_irq_add,
 };
 
 static int s3c2412_irq_init(void)
 {
-        return sysdev_driver_register(&s3c2412_sysclass, &s3c2412_irq_driver);
+        return subsys_interface_register(&s3c2412_irq_interface);
 }
 
 arch_initcall(s3c2412_irq_init);
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c
index f4077efa51fa..d1adfa65f66d 100644
--- a/arch/arm/mach-s3c2412/pm.c
+++ b/arch/arm/mach-s3c2412/pm.c
@@ -16,7 +16,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
@@ -56,7 +56,7 @@ static void s3c2412_pm_prepare(void)
 {
 }
 
-static int s3c2412_pm_add(struct sys_device *sysdev)
+static int s3c2412_pm_add(struct device *dev)
 {
         pm_cpu_prep = s3c2412_pm_prepare;
         pm_cpu_sleep = s3c2412_cpu_suspend;
@@ -87,13 +87,15 @@ static struct sleep_save s3c2412_sleep[] = {
         SAVE_ITEM(S3C2413_GPJSLPCON),
 };
 
-static struct sysdev_driver s3c2412_pm_driver = {
-        .add            = s3c2412_pm_add,
+static struct subsys_interface s3c2412_pm_interface = {
+        .name           = "s3c2412_pm",
+        .subsys         = &s3c2412_subsys,
+        .add_dev        = s3c2412_pm_add,
 };
 
 static __init int s3c2412_pm_init(void)
 {
-        return sysdev_driver_register(&s3c2412_sysclass, &s3c2412_pm_driver);
+        return subsys_interface_register(&s3c2412_pm_interface);
 }
 
 arch_initcall(s3c2412_pm_init);
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c
index 57a1e01e4e50..6c7253ffc5bc 100644
--- a/arch/arm/mach-s3c2412/s3c2412.c
+++ b/arch/arm/mach-s3c2412/s3c2412.c
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
@@ -220,25 +220,26 @@ void __init s3c2412_init_clocks(int xtal)
         s3c2412_baseclk_add();
 }
 
-/* need to register class before we actually register the device, and
+/* need to register the subsystem before we actually register the device, and
  * we also need to ensure that it has been initialised before any of the
  * drivers even try to use it (even if not on an s3c2412 based system)
  * as a driver which may support both 2410 and 2440 may try and use it.
 */
 
-struct sysdev_class s3c2412_sysclass = {
+struct bus_type s3c2412_subsys = {
         .name = "s3c2412-core",
+        .dev_name = "s3c2412-core",
 };
 
 static int __init s3c2412_core_init(void)
 {
-        return sysdev_class_register(&s3c2412_sysclass);
+        return subsys_system_register(&s3c2412_subsys, NULL);
 }
 
 core_initcall(s3c2412_core_init);
 
-static struct sys_device s3c2412_sysdev = {
-        .cls            = &s3c2412_sysclass,
+static struct device s3c2412_dev = {
+        .bus            = &s3c2412_subsys,
 };
 
 int __init s3c2412_init(void)
@@ -250,5 +251,5 @@ int __init s3c2412_init(void)
 #endif
         register_syscore_ops(&s3c24xx_irq_syscore_ops);
 
-        return sysdev_register(&s3c2412_sysdev);
+        return device_register(&s3c2412_dev);
 }
diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c
index 28ad20d42445..36df761061de 100644
--- a/arch/arm/mach-s3c2416/irq.c
+++ b/arch/arm/mach-s3c2416/irq.c
@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -213,7 +213,7 @@ static int __init s3c2416_add_sub(unsigned int base,
         return 0;
 }
 
-static int __init s3c2416_irq_add(struct sys_device *sysdev)
+static int __init s3c2416_irq_add(struct device *dev)
 {
         printk(KERN_INFO "S3C2416: IRQ Support\n");
 
@@ -234,13 +234,15 @@ static int __init s3c2416_irq_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2416_irq_driver = {
-        .add            = s3c2416_irq_add,
+static struct subsys_interface s3c2416_irq_interface = {
+        .name           = "s3c2416_irq",
+        .subsys         = &s3c2416_subsys,
+        .add_dev        = s3c2416_irq_add,
 };
 
 static int __init s3c2416_irq_init(void)
 {
-        return sysdev_driver_register(&s3c2416_sysclass, &s3c2416_irq_driver);
+        return subsys_interface_register(&s3c2416_irq_interface);
 }
 
 arch_initcall(s3c2416_irq_init);
diff --git a/arch/arm/mach-s3c2416/pm.c b/arch/arm/mach-s3c2416/pm.c
index 9ec54f1d8e75..3bdb15a0d419 100644
--- a/arch/arm/mach-s3c2416/pm.c
+++ b/arch/arm/mach-s3c2416/pm.c
@@ -10,7 +10,7 @@
  * published by the Free Software Foundation.
 */
 
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/io.h>
 
@@ -48,7 +48,7 @@ static void s3c2416_pm_prepare(void)
         __raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1);
 }
 
-static int s3c2416_pm_add(struct sys_device *sysdev)
+static int s3c2416_pm_add(struct device *dev)
 {
         pm_cpu_prep = s3c2416_pm_prepare;
         pm_cpu_sleep = s3c2416_cpu_suspend;
@@ -56,13 +56,15 @@ static int s3c2416_pm_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2416_pm_driver = {
-        .add            = s3c2416_pm_add,
+static struct subsys_interface s3c2416_pm_interface = {
+        .name           = "s3c2416_pm",
+        .subsys         = &s3c2416_subsys,
+        .add_dev        = s3c2416_pm_add,
 };
 
 static __init int s3c2416_pm_init(void)
 {
-        return sysdev_driver_register(&s3c2416_sysclass, &s3c2416_pm_driver);
+        return subsys_interface_register(&s3c2416_pm_interface);
 }
 
 arch_initcall(s3c2416_pm_init);
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c
index ee214bc83c83..143db908c2c5 100644
--- a/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
@@ -31,7 +31,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/clk.h>
 #include <linux/io.h>
@@ -68,12 +68,13 @@ static struct map_desc s3c2416_iodesc[] __initdata = {
         IODESC_ENT(TIMER),
 };
 
-struct sysdev_class s3c2416_sysclass = {
+struct bus_type s3c2416_subsys = {
         .name = "s3c2416-core",
+        .dev_name = "s3c2416-core",
 };
 
-static struct sys_device s3c2416_sysdev = {
-        .cls            = &s3c2416_sysclass,
+static struct device s3c2416_dev = {
+        .bus            = &s3c2416_subsys,
 };
 
 static void s3c2416_hard_reset(void)
@@ -105,7 +106,7 @@ int __init s3c2416_init(void)
 #endif
         register_syscore_ops(&s3c24xx_irq_syscore_ops);
 
-        return sysdev_register(&s3c2416_sysdev);
+        return device_register(&s3c2416_dev);
 }
 
 void __init s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no)
@@ -133,7 +134,7 @@ void __init s3c2416_map_io(void)
         iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc));
 }
 
-/* need to register class before we actually register the device, and
+/* need to register the subsystem before we actually register the device, and
  * we also need to ensure that it has been initialised before any of the
  * drivers even try to use it (even if not on an s3c2416 based system)
  * as a driver which may support both 2443 and 2440 may try and use it.
@@ -141,7 +142,7 @@ void __init s3c2416_map_io(void)
 
 static int __init s3c2416_core_init(void)
 {
-        return sysdev_class_register(&s3c2416_sysclass);
+        return subsys_system_register(&s3c2416_subsys, NULL);
 }
 
 core_initcall(s3c2416_core_init);
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c
index f9e6bdaf41d2..d8957592fdc4 100644
--- a/arch/arm/mach-s3c2440/clock.c
+++ b/arch/arm/mach-s3c2440/clock.c
@@ -28,7 +28,6 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/mutex.h>
@@ -108,7 +107,7 @@ static struct clk s3c2440_clk_ac97 = {
         .ctrlbit        = S3C2440_CLKCON_CAMERA,
 };
 
-static int s3c2440_clk_add(struct sys_device *sysdev)
+static int s3c2440_clk_add(struct device *dev)
 {
         struct clk *clock_upll;
         struct clk *clock_h;
@@ -137,13 +136,15 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2440_clk_driver = {
-        .add    = s3c2440_clk_add,
+static struct subsys_interface s3c2440_clk_interface = {
+        .name           = "s3c2440_clk",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c2440_clk_add,
 };
 
-static __init int s3c24xx_clk_driver(void)
+static __init int s3c24xx_clk_init(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_clk_driver);
+        return subsys_interface_register(&s3c2440_clk_interface);
 }
 
-arch_initcall(s3c24xx_clk_driver);
+arch_initcall(s3c24xx_clk_init);
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c
index 0e73f8f9d132..15b1ddf8f626 100644
--- a/arch/arm/mach-s3c2440/dma.c
+++ b/arch/arm/mach-s3c2440/dma.c
@@ -14,7 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 
 #include <mach/map.h>
@@ -174,20 +174,22 @@ static struct s3c24xx_dma_order __initdata s3c2440_dma_order = {
         },
 };
 
-static int __init s3c2440_dma_add(struct sys_device *sysdev)
+static int __init s3c2440_dma_add(struct device *dev)
 {
         s3c2410_dma_init();
         s3c24xx_dma_order_set(&s3c2440_dma_order);
         return s3c24xx_dma_init_map(&s3c2440_dma_sel);
 }
 
-static struct sysdev_driver s3c2440_dma_driver = {
-        .add    = s3c2440_dma_add,
+static struct subsys_interface s3c2440_dma_interface = {
+        .name           = "s3c2440_dma",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c2440_dma_add,
 };
 
 static int __init s3c2440_dma_init(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_dma_driver);
+        return subsys_interface_register(&s3c2440_dma_interface);
 }
 
 arch_initcall(s3c2440_dma_init);
diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c
index eb1cc0f0705e..4fee9bc6bcb5 100644
--- a/arch/arm/mach-s3c2440/irq.c
+++ b/arch/arm/mach-s3c2440/irq.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -92,7 +92,7 @@ static struct irq_chip s3c_irq_wdtac97 = {
         .irq_ack        = s3c_irq_wdtac97_ack,
 };
 
-static int s3c2440_irq_add(struct sys_device *sysdev)
+static int s3c2440_irq_add(struct device *dev)
 {
         unsigned int irqno;
 
@@ -113,13 +113,15 @@ static int s3c2440_irq_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2440_irq_driver = {
-        .add            = s3c2440_irq_add,
+static struct subsys_interface s3c2440_irq_interface = {
+        .name           = "s3c2440_irq",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c2440_irq_add,
 };
 
 static int s3c2440_irq_init(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_irq_driver);
+        return subsys_interface_register(&s3c2440_irq_interface);
 }
 
 arch_initcall(s3c2440_irq_init);
diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c
index 0d3453bf567c..2078c1fe8e35 100644
--- a/arch/arm/mach-s3c2440/mach-rx1950.c
+++ b/arch/arm/mach-s3c2440/mach-rx1950.c
@@ -24,7 +24,7 @@
 #include <linux/serial_core.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/pda_power.h>
 #include <linux/pwm_backlight.h>
 #include <linux/pwm.h>
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index e19499c2f909..4c2f553fbd52 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -20,7 +20,7 @@
 #include <linux/init.h>
 #include <linux/tty.h>
 #include <linux/console.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
diff --git a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c b/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
index 976002fb1b8f..cf7596694efe 100644
--- a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
+++ b/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
@@ -17,7 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/cpufreq.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/err.h>
@@ -270,7 +270,7 @@ struct s3c_cpufreq_info s3c2440_cpufreq_info = {
         .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),
 };
 
-static int s3c2440_cpufreq_add(struct sys_device *sysdev)
+static int s3c2440_cpufreq_add(struct device *dev)
 {
         xtal = s3c_cpufreq_clk_get(NULL, "xtal");
         hclk = s3c_cpufreq_clk_get(NULL, "hclk");
@@ -285,27 +285,29 @@ static int s3c2440_cpufreq_add(struct sys_device *sysdev)
         return s3c_cpufreq_register(&s3c2440_cpufreq_info);
 }
 
-static struct sysdev_driver s3c2440_cpufreq_driver = {
-        .add            = s3c2440_cpufreq_add,
+static struct subsys_interface s3c2440_cpufreq_interface = {
+        .name           = "s3c2440_cpufreq",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c2440_cpufreq_add,
 };
 
 static int s3c2440_cpufreq_init(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass,
-                                      &s3c2440_cpufreq_driver);
+        return subsys_interface_register(&s3c2440_cpufreq_interface);
 }
 
 /* arch_initcall adds the clocks we need, so use subsys_initcall. */
 subsys_initcall(s3c2440_cpufreq_init);
 
-static struct sysdev_driver s3c2442_cpufreq_driver = {
-        .add            = s3c2440_cpufreq_add,
+static struct subsys_interface s3c2442_cpufreq_interface = {
+        .name           = "s3c2442_cpufreq",
+        .subsys         = &s3c2442_subsys,
+        .add_dev        = s3c2440_cpufreq_add,
 };
 
 static int s3c2442_cpufreq_init(void)
 {
-        return sysdev_driver_register(&s3c2442_sysclass,
-                                      &s3c2442_cpufreq_driver);
+        return subsys_interface_register(&s3c2442_cpufreq_interface);
 }
 
 subsys_initcall(s3c2442_cpufreq_init);
diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c b/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
index f105d5e8c477..b5368ae8d7fe 100644
--- a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
+++ b/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
@@ -14,7 +14,7 @@
 
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 
@@ -51,7 +51,7 @@ static struct cpufreq_frequency_table s3c2440_plls_12[] __initdata = {
         { .frequency = 400000000,       .index = PLLVAL(0x5c, 1, 1),  },        /* FVco 800.000000 */
 };
 
-static int s3c2440_plls12_add(struct sys_device *dev)
+static int s3c2440_plls12_add(struct device *dev)
 {
         struct clk *xtal_clk;
         unsigned long xtal;
@@ -72,25 +72,29 @@ static int s3c2440_plls12_add(struct sys_device *dev)
         return 0;
 }
 
-static struct sysdev_driver s3c2440_plls12_drv = {
-        .add    = s3c2440_plls12_add,
+static struct subsys_interface s3c2440_plls12_interface = {
+        .name           = "s3c2440_plls12",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c2440_plls12_add,
 };
 
 static int __init s3c2440_pll_12mhz(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_plls12_drv);
+        return subsys_interface_register(&s3c2440_plls12_interface);
 
 }
 
 arch_initcall(s3c2440_pll_12mhz);
 
-static struct sysdev_driver s3c2442_plls12_drv = {
-        .add    = s3c2440_plls12_add,
+static struct subsys_interface s3c2442_plls12_interface = {
+        .name           = "s3c2442_plls12",
+        .subsys         = &s3c2442_subsys,
+        .add_dev        = s3c2440_plls12_add,
 };
 
 static int __init s3c2442_pll_12mhz(void)
 {
-        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_plls12_drv);
+        return subsys_interface_register(&s3c2442_plls12_interface);
 
 }
 
diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c b/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
index c8a8f90ef382..42f2b5cd2399 100644
--- a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
+++ b/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
@@ -14,7 +14,7 @@
 
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 
@@ -79,7 +79,7 @@ static struct cpufreq_frequency_table s3c2440_plls_169344[] __initdata = {
         { .frequency = 402192000,       .index = PLLVAL(87, 2, 1),      },      /* FVco 804.384000 */
 };
 
-static int s3c2440_plls169344_add(struct sys_device *dev)
+static int s3c2440_plls169344_add(struct device *dev)
 {
         struct clk *xtal_clk;
         unsigned long xtal;
@@ -100,28 +100,28 @@ static int s3c2440_plls169344_add(struct sys_device *dev)
         return 0;
 }
 
-static struct sysdev_driver s3c2440_plls169344_drv = {
-        .add    = s3c2440_plls169344_add,
+static struct subsys_interface s3c2440_plls169344_interface = {
+        .name           = "s3c2440_plls169344",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c2440_plls169344_add,
 };
 
 static int __init s3c2440_pll_16934400(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass,
-                                      &s3c2440_plls169344_drv);
-
+        return subsys_interface_register(&s3c2440_plls169344_interface);
 }
 
 arch_initcall(s3c2440_pll_16934400);
 
-static struct sysdev_driver s3c2442_plls169344_drv = {
-        .add    = s3c2440_plls169344_add,
+static struct subsys_interface s3c2442_plls169344_interface = {
+        .name           = "s3c2442_plls169344",
+        .subsys         = &s3c2442_subsys,
+        .add_dev        = s3c2440_plls169344_add,
 };
 
 static int __init s3c2442_pll_16934400(void)
 {
-        return sysdev_driver_register(&s3c2442_sysclass,
-                                      &s3c2442_plls169344_drv);
-
+        return subsys_interface_register(&s3c2442_plls169344_interface);
 }
 
 arch_initcall(s3c2442_pll_16934400);
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
index 37f8cc6aabd4..2b3dddb49af7 100644
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
@@ -40,8 +40,8 @@
 #include <plat/gpio-cfg.h>
 #include <plat/gpio-cfg-helpers.h>
 
-static struct sys_device s3c2440_sysdev = {
-        .cls            = &s3c2440_sysclass,
+static struct device s3c2440_dev = {
+        .bus            = &s3c2440_subsys,
 };
 
 int __init s3c2440_init(void)
@@ -63,7 +63,7 @@ int __init s3c2440_init(void)
 
         /* register our system device for everything else */
 
-        return sysdev_register(&s3c2440_sysdev);
+        return device_register(&s3c2440_dev);
 }
 
 void __init s3c2440_map_io(void)
diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c
index 2c822e09392f..8004e0497bf4 100644
--- a/arch/arm/mach-s3c2440/s3c2442.c
+++ b/arch/arm/mach-s3c2440/s3c2442.c
@@ -28,7 +28,6 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/syscore_ops.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
@@ -123,7 +122,7 @@ static struct clk s3c2442_clk_cam_upll = {
         },
 };
 
-static int s3c2442_clk_add(struct sys_device *sysdev)
+static int s3c2442_clk_add(struct device *dev)
 {
         struct clk *clock_upll;
         struct clk *clock_h;
@@ -149,20 +148,22 @@ static int s3c2442_clk_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2442_clk_driver = {
-        .add    = s3c2442_clk_add,
+static struct subsys_interface s3c2442_clk_interface = {
+        .name           = "s3c2442_clk",
+        .subsys         = &s3c2442_subsys,
+        .add_dev        = s3c2442_clk_add,
 };
 
 static __init int s3c2442_clk_init(void)
 {
-        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_clk_driver);
+        return subsys_interface_register(&s3c2442_clk_interface);
 }
 
 arch_initcall(s3c2442_clk_init);
 
 
-static struct sys_device s3c2442_sysdev = {
-        .cls            = &s3c2442_sysclass,
+static struct device s3c2442_dev = {
+        .bus            = &s3c2442_subsys,
 };
 
 int __init s3c2442_init(void)
@@ -175,7 +176,7 @@ int __init s3c2442_init(void)
         register_syscore_ops(&s3c244x_pm_syscore_ops);
         register_syscore_ops(&s3c24xx_irq_syscore_ops);
 
-        return sysdev_register(&s3c2442_sysdev);
+        return device_register(&s3c2442_dev);
 }
 
 void __init s3c2442_map_io(void)
diff --git a/arch/arm/mach-s3c2440/s3c244x-clock.c b/arch/arm/mach-s3c2440/s3c244x-clock.c
index 7f5ea0a169a5..b3fdbdda3d5f 100644
--- a/arch/arm/mach-s3c2440/s3c244x-clock.c
+++ b/arch/arm/mach-s3c2440/s3c244x-clock.c
@@ -28,7 +28,6 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/clk.h>
@@ -73,7 +72,7 @@ static struct clk clk_arm = {
         },
 };
 
-static int s3c244x_clk_add(struct sys_device *sysdev)
+static int s3c244x_clk_add(struct device *dev)
 {
         unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);
         unsigned long clkdivn;
@@ -115,24 +114,28 @@ static int s3c244x_clk_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2440_clk_driver = {
-        .add            = s3c244x_clk_add,
+static struct subsys_interface s3c2440_clk_interface = {
+        .name           = "s3c2440_clk",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c244x_clk_add,
 };
 
 static int s3c2440_clk_init(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_clk_driver);
+        return subsys_interface_register(&s3c2440_clk_interface);
 }
 
 arch_initcall(s3c2440_clk_init);
 
-static struct sysdev_driver s3c2442_clk_driver = {
-        .add            = s3c244x_clk_add,
+static struct subsys_interface s3c2442_clk_interface = {
+        .name           = "s3c2442_clk",
+        .subsys         = &s3c2442_subsys,
+        .add_dev        = s3c244x_clk_add,
 };
 
 static int s3c2442_clk_init(void)
 {
-        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_clk_driver);
+        return subsys_interface_register(&s3c2442_clk_interface);
 }
 
 arch_initcall(s3c2442_clk_init);
diff --git a/arch/arm/mach-s3c2440/s3c244x-irq.c b/arch/arm/mach-s3c2440/s3c244x-irq.c
index c63e8f26d901..74d3dcf46a48 100644
--- a/arch/arm/mach-s3c2440/s3c244x-irq.c
+++ b/arch/arm/mach-s3c2440/s3c244x-irq.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -91,7 +91,7 @@ static struct irq_chip s3c_irq_cam = {
         .irq_ack        = s3c_irq_cam_ack,
 };
 
-static int s3c244x_irq_add(struct sys_device *sysdev)
+static int s3c244x_irq_add(struct device *dev)
 {
         unsigned int irqno;
 
@@ -114,25 +114,29 @@ static int s3c244x_irq_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2440_irq_driver = {
-        .add            = s3c244x_irq_add,
+static struct subsys_interface s3c2440_irq_interface = {
+        .name           = "s3c2440_irq",
+        .subsys         = &s3c2440_subsys,
+        .add_dev        = s3c244x_irq_add,
 };
 
 static int s3c2440_irq_init(void)
 {
-        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_irq_driver);
+        return subsys_interface_register(&s3c2440_irq_interface);
 }
 
 arch_initcall(s3c2440_irq_init);
 
-static struct sysdev_driver s3c2442_irq_driver = {
-        .add            = s3c244x_irq_add,
+static struct subsys_interface s3c2442_irq_interface = {
+        .name           = "s3c2442_irq",
+        .subsys         = &s3c2442_subsys,
+        .add_dev        = s3c244x_irq_add,
 };
 
 
 static int s3c2442_irq_init(void)
 {
-        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_irq_driver);
+        return subsys_interface_register(&s3c2442_irq_interface);
 }
 
 arch_initcall(s3c2442_irq_init);
diff --git a/arch/arm/mach-s3c2440/s3c244x.c b/arch/arm/mach-s3c2440/s3c244x.c
index 7e8a23d2098a..36bc60f61d0a 100644
--- a/arch/arm/mach-s3c2440/s3c244x.c
+++ b/arch/arm/mach-s3c2440/s3c244x.c
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/clk.h>
 #include <linux/io.h>
@@ -135,17 +135,19 @@ void __init s3c244x_init_clocks(int xtal)
         s3c2410_baseclk_add();
 }
 
-/* Since the S3C2442 and S3C2440 share  items, put both sysclasses here */
+/* Since the S3C2442 and S3C2440 share items, put both subsystems here */
 
-struct sysdev_class s3c2440_sysclass = {
+struct bus_type s3c2440_subsys = {
         .name           = "s3c2440-core",
+        .dev_name       = "s3c2440-core",
 };
 
-struct sysdev_class s3c2442_sysclass = {
+struct bus_type s3c2442_subsys = {
         .name           = "s3c2442-core",
+        .dev_name       = "s3c2442-core",
 };
 
-/* need to register class before we actually register the device, and
+/* need to register the subsystem before we actually register the device, and
  * we also need to ensure that it has been initialised before any of the
  * drivers even try to use it (even if not on an s3c2440 based system)
  * as a driver which may support both 2410 and 2440 may try and use it.
@@ -153,14 +155,14 @@ struct sysdev_class s3c2442_sysclass = {
 
 static int __init s3c2440_core_init(void)
 {
-        return sysdev_class_register(&s3c2440_sysclass);
+        return subsys_system_register(&s3c2440_subsys, NULL);
 }
 
 core_initcall(s3c2440_core_init);
 
 static int __init s3c2442_core_init(void)
 {
-        return sysdev_class_register(&s3c2442_sysclass);
+        return subsys_system_register(&s3c2442_subsys, NULL);
 }
 
 core_initcall(s3c2442_core_init);
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c
index 1c2c088aa2e8..6dde2696f8f0 100644
--- a/arch/arm/mach-s3c2443/clock.c
+++ b/arch/arm/mach-s3c2443/clock.c
@@ -27,7 +27,7 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/mutex.h>
 #include <linux/serial_core.h>
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c
index fe52151d2e84..de6b4a23c9ed 100644
--- a/arch/arm/mach-s3c2443/dma.c
+++ b/arch/arm/mach-s3c2443/dma.c
@@ -14,7 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/io.h>
 
@@ -135,19 +135,21 @@ static struct s3c24xx_dma_selection __initdata s3c2443_dma_sel = {
         .map_size       = ARRAY_SIZE(s3c2443_dma_mappings),
 };
 
-static int __init s3c2443_dma_add(struct sys_device *sysdev)
+static int __init s3c2443_dma_add(struct device *dev)
 {
         s3c24xx_dma_init(6, IRQ_S3C2443_DMA0, 0x100);
         return s3c24xx_dma_init_map(&s3c2443_dma_sel);
 }
 
-static struct sysdev_driver s3c2443_dma_driver = {
-        .add    = s3c2443_dma_add,
+static struct subsys_interface s3c2443_dma_interface = {
+        .name           = "s3c2443_dma",
+        .subsys         = &s3c2443_subsys,
+        .add_dev        = s3c2443_dma_add,
 };
 
 static int __init s3c2443_dma_init(void)
 {
-        return sysdev_driver_register(&s3c2443_sysclass, &s3c2443_dma_driver);
+        return subsys_interface_register(&s3c2443_dma_interface);
 }
 
 arch_initcall(s3c2443_dma_init);
diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c
index 83ecb1173fb1..35e4ff24fb43 100644
--- a/arch/arm/mach-s3c2443/irq.c
+++ b/arch/arm/mach-s3c2443/irq.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -241,7 +241,7 @@ static int __init s3c2443_add_sub(unsigned int base,
         return 0;
 }
 
-static int __init s3c2443_irq_add(struct sys_device *sysdev)
+static int __init s3c2443_irq_add(struct device *dev)
 {
         printk("S3C2443: IRQ Support\n");
 
@@ -265,13 +265,15 @@ static int __init s3c2443_irq_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s3c2443_irq_driver = {
-        .add            = s3c2443_irq_add,
+static struct subsys_interface s3c2443_irq_interface = {
+        .name           = "s3c2443_irq",
+        .subsys         = &s3c2443_subsys,
+        .add_dev        = s3c2443_irq_add,
 };
 
 static int __init s3c2443_irq_init(void)
 {
-        return sysdev_driver_register(&s3c2443_sysclass, &s3c2443_irq_driver);
+        return subsys_interface_register(&s3c2443_irq_interface);
 }
 
 arch_initcall(s3c2443_irq_init);
diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c
index a22b771b0f36..aa90ae4fc980 100644
--- a/arch/arm/mach-s3c2443/s3c2443.c
+++ b/arch/arm/mach-s3c2443/s3c2443.c
@@ -19,7 +19,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 
@@ -49,12 +49,13 @@ static struct map_desc s3c2443_iodesc[] __initdata = {
         IODESC_ENT(TIMER),
 };
 
-struct sysdev_class s3c2443_sysclass = {
+struct bus_type s3c2443_subsys = {
         .name = "s3c2443-core",
+        .dev_name = "s3c2443-core",
 };
 
-static struct sys_device s3c2443_sysdev = {
-        .cls            = &s3c2443_sysclass,
+static struct device s3c2443_dev = {
+        .bus            = &s3c2443_subsys,
 };
 
 static void s3c2443_hard_reset(void)
@@ -77,7 +78,7 @@ int __init s3c2443_init(void)
         s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
         s3c_device_wdt.resource[1].end   = IRQ_S3C2443_WDT;
 
-        return sysdev_register(&s3c2443_sysdev);
+        return device_register(&s3c2443_dev);
 }
 
 void __init s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no)
@@ -99,7 +100,7 @@ void __init s3c2443_map_io(void)
         iotable_init(s3c2443_iodesc, ARRAY_SIZE(s3c2443_iodesc));
 }
 
-/* need to register class before we actually register the device, and
+/* need to register the subsystem before we actually register the device, and
  * we also need to ensure that it has been initialised before any of the
  * drivers even try to use it (even if not on an s3c2443 based system)
  * as a driver which may support both 2443 and 2440 may try and use it.
@@ -107,7 +108,7 @@ void __init s3c2443_map_io(void)
 
 static int __init s3c2443_core_init(void)
 {
-        return sysdev_class_register(&s3c2443_sysclass);
+        return subsys_system_register(&s3c2443_subsys, NULL);
 }
 
 core_initcall(s3c2443_core_init);
diff --git a/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c
index de085b798aa4..0f8a669dc7fc 100644
--- a/arch/arm/mach-s3c64xx/cpu.c
+++ b/arch/arm/mach-s3c64xx/cpu.c
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
@@ -122,12 +122,13 @@ static struct map_desc s3c_iodesc[] __initdata = {
 };
 
 
-struct sysdev_class s3c64xx_sysclass = {
-        .name   = "s3c64xx-core",
+struct bus_type s3c64xx_subsys = {
+        .name           = "s3c64xx-core",
+        .dev_name       = "s3c64xx-core",
 };
 
-static struct sys_device s3c64xx_sysdev = {
-        .cls    = &s3c64xx_sysclass,
+static struct device s3c64xx_dev = {
+        .bus    = &s3c64xx_subsys,
 };
 
 /* uart registration process */
@@ -152,10 +153,10 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
         s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
 }
 
-static __init int s3c64xx_sysdev_init(void)
+static __init int s3c64xx_dev_init(void)
 {
-        sysdev_class_register(&s3c64xx_sysclass);
-        return sysdev_register(&s3c64xx_sysdev);
+        subsys_system_register(&s3c64xx_subsys, NULL);
+        return device_register(&s3c64xx_dev);
 }
 
-core_initcall(s3c64xx_sysdev_init);
+core_initcall(s3c64xx_dev_init);
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c
index 17d62f4f8204..f2a7a1725596 100644
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/dmapool.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -35,7 +35,7 @@
 /* dma channel state information */
 
 struct s3c64xx_dmac {
-        struct sys_device        sysdev;
+        struct device           dev;
         struct clk              *clk;
         void __iomem            *regs;
         struct s3c2410_dma_chan *channels;
@@ -631,8 +631,9 @@ static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
         return IRQ_HANDLED;
 }
 
-static struct sysdev_class dma_sysclass = {
+static struct bus_type dma_subsys = {
         .name           = "s3c64xx-dma",
+        .dev_name       = "s3c64xx-dma",
 };
 
 static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
@@ -651,12 +652,12 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
                 return -ENOMEM;
         }
 
-        dmac->sysdev.id = chno / 8;
-        dmac->sysdev.cls = &dma_sysclass;
+        dmac->dev.id = chno / 8;
+        dmac->dev.bus = &dma_subsys;
 
-        err = sysdev_register(&dmac->sysdev);
+        err = device_register(&dmac->dev);
         if (err) {
-                printk(KERN_ERR "%s: failed to register sysdevice\n", __func__);
+                printk(KERN_ERR "%s: failed to register device\n", __func__);
                 goto err_alloc;
         }
 
@@ -667,7 +668,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
                 goto err_dev;
         }
 
-        snprintf(clkname, sizeof(clkname), "dma%d", dmac->sysdev.id);
+        snprintf(clkname, sizeof(clkname), "dma%d", dmac->dev.id);
 
         dmac->clk = clk_get(NULL, clkname);
         if (IS_ERR(dmac->clk)) {
@@ -715,7 +716,7 @@ err_clk:
 err_map:
         iounmap(regs);
 err_dev:
-        sysdev_unregister(&dmac->sysdev);
+        device_unregister(&dmac->dev);
 err_alloc:
         kfree(dmac);
         return err;
@@ -733,9 +734,9 @@ static int __init s3c64xx_dma_init(void)
                 return -ENOMEM;
         }
 
-        ret = sysdev_class_register(&dma_sysclass);
+        ret = subsys_system_register(&dma_subsys, NULL);
         if (ret) {
-                printk(KERN_ERR "%s: failed to create sysclass\n", __func__);
+                printk(KERN_ERR "%s: failed to create subsys\n", __func__);
                 return -ENOMEM;
         }
 
diff --git a/arch/arm/mach-s3c64xx/irq-eint.c b/arch/arm/mach-s3c64xx/irq-eint.c
index 4d203be1f4c3..e3e75d186039 100644
--- a/arch/arm/mach-s3c64xx/irq-eint.c
+++ b/arch/arm/mach-s3c64xx/irq-eint.c
@@ -14,7 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/gpio.h>
 #include <linux/irq.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c
index 51c00f2453c6..691a7ca78c1e 100644
--- a/arch/arm/mach-s3c64xx/s3c6400.c
+++ b/arch/arm/mach-s3c64xx/s3c6400.c
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
@@ -70,17 +70,18 @@ void __init s3c6400_init_irq(void)
         s3c64xx_init_irq(~0 & ~(0xf << 5), ~0);
 }
 
-static struct sysdev_class s3c6400_sysclass = {
-        .name   = "s3c6400-core",
+static struct bus_type s3c6400_subsys = {
+        .name           = "s3c6400-core",
+        .dev_name       = "s3c6400-core",
 };
 
-static struct sys_device s3c6400_sysdev = {
-        .cls    = &s3c6400_sysclass,
+static struct device s3c6400_dev = {
+        .bus    = &s3c6400_subsys,
 };
 
 static int __init s3c6400_core_init(void)
 {
-        return sysdev_class_register(&s3c6400_sysclass);
+        return subsys_system_register(&s3c6400_subsys, NULL);
 }
 
 core_initcall(s3c6400_core_init);
@@ -89,5 +90,5 @@ int __init s3c6400_init(void)
 {
         printk("S3C6400: Initialising architecture\n");
 
-        return sysdev_register(&s3c6400_sysdev);
+        return device_register(&s3c6400_dev);
 }
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c
index 4117003464ad..9a5484ad4308 100644
--- a/arch/arm/mach-s3c64xx/s3c6410.c
+++ b/arch/arm/mach-s3c64xx/s3c6410.c
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
@@ -75,17 +75,18 @@ void __init s3c6410_init_irq(void)
         s3c64xx_init_irq(~0 & ~(1 << 7), ~0);
 }
 
-struct sysdev_class s3c6410_sysclass = {
-        .name   = "s3c6410-core",
+struct bus_type s3c6410_subsys = {
+        .name           = "s3c6410-core",
+        .dev_name       = "s3c6410-core",
 };
 
-static struct sys_device s3c6410_sysdev = {
-        .cls    = &s3c6410_sysclass,
+static struct device s3c6410_dev = {
+        .bus    = &s3c6410_subsys,
 };
 
 static int __init s3c6410_core_init(void)
 {
-        return sysdev_class_register(&s3c6410_sysclass);
+        return subsys_system_register(&s3c6410_subsys, NULL);
 }
 
 core_initcall(s3c6410_core_init);
@@ -94,5 +95,5 @@ int __init s3c6410_init(void)
 {
         printk("S3C6410: Initialising architecture\n");
 
-        return sysdev_register(&s3c6410_sysdev);
+        return device_register(&s3c6410_dev);
 }
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c
index c54c65d511f0..8a293c3e3944 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c
@@ -17,7 +17,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c
index 2d04abfba12e..0277b483b9b7 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6450.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c
@@ -17,7 +17,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-s5p64x0/clock.c b/arch/arm/mach-s5p64x0/clock.c
index b52c6e2f37a6..041f91e5b425 100644
--- a/arch/arm/mach-s5p64x0/clock.c
+++ b/arch/arm/mach-s5p64x0/clock.c
@@ -17,7 +17,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c
index ecab40cf19ab..74387a1bc76a 100644
--- a/arch/arm/mach-s5p64x0/cpu.c
+++ b/arch/arm/mach-s5p64x0/cpu.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
@@ -190,17 +190,18 @@ void __init s5p6450_init_irq(void)
         s5p_init_irq(vic, ARRAY_SIZE(vic));
 }
 
-struct sysdev_class s5p64x0_sysclass = {
-        .name   = "s5p64x0-core",
+struct bus_type s5p64x0_subsys = {
+        .name           = "s5p64x0-core",
+        .dev_name       = "s5p64x0-core",
 };
 
-static struct sys_device s5p64x0_sysdev = {
-        .cls    = &s5p64x0_sysclass,
+static struct device s5p64x0_dev = {
+        .bus    = &s5p64x0_subsys,
 };
 
 static int __init s5p64x0_core_init(void)
 {
-        return sysdev_class_register(&s5p64x0_sysclass);
+        return subsys_system_register(&s5p64x0_subsys, NULL);
 }
 core_initcall(s5p64x0_core_init);
 
@@ -211,5 +212,5 @@ int __init s5p64x0_init(void)
         /* set idle function */
         pm_idle = s5p64x0_idle;
 
-        return sysdev_register(&s5p64x0_sysdev);
+        return device_register(&s5p64x0_dev);
 }
diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c
index 69927243d25f..23f9b22439c9 100644
--- a/arch/arm/mach-s5p64x0/pm.c
+++ b/arch/arm/mach-s5p64x0/pm.c
@@ -160,7 +160,7 @@ static void s5p64x0_pm_prepare(void)
 
 }
 
-static int s5p64x0_pm_add(struct sys_device *sysdev)
+static int s5p64x0_pm_add(struct device *dev)
 {
         pm_cpu_prep = s5p64x0_pm_prepare;
         pm_cpu_sleep = s5p64x0_cpu_suspend;
@@ -169,15 +169,17 @@ static int s5p64x0_pm_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s5p64x0_pm_driver = {
-        .add            = s5p64x0_pm_add,
+static struct subsys_interface s5p64x0_pm_interface = {
+        .name           = "s5p64x0_pm",
+        .subsys         = &s5p64x0_subsys,
+        .add_dev        = s5p64x0_pm_add,
 };
 
 static __init int s5p64x0_pm_drvinit(void)
 {
         s3c_pm_init();
 
-        return sysdev_driver_register(&s5p64x0_sysclass, &s5p64x0_pm_driver);
+        return subsys_interface_register(&s5p64x0_pm_interface);
 }
 arch_initcall(s5p64x0_pm_drvinit);
 
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c
index fd2708e7d8a9..330a10b23a5d 100644
--- a/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c
@@ -21,7 +21,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
@@ -143,17 +143,18 @@ void __init s5pc100_init_irq(void)
         s5p_init_irq(vic, ARRAY_SIZE(vic));
 }
 
-static struct sysdev_class s5pc100_sysclass = {
-        .name   = "s5pc100-core",
+static struct bus_type s5pc100_subsys = {
+        .name           = "s5pc100-core",
+        .dev_name       = "s5pc100-core",
 };
 
-static struct sys_device s5pc100_sysdev = {
-        .cls    = &s5pc100_sysclass,
+static struct device s5pc100_dev = {
+        .bus    = &s5pc100_subsys,
 };
 
 static int __init s5pc100_core_init(void)
 {
-        return sysdev_class_register(&s5pc100_sysclass);
+        return subsys_system_register(&s5pc100_subsys, NULL);
 }
 
 core_initcall(s5pc100_core_init);
@@ -165,5 +166,5 @@ int __init s5pc100_init(void)
         /* set idle function */
         pm_idle = s5pc100_idle;
 
-        return sysdev_register(&s5pc100_sysdev);
+        return device_register(&s5pc100_dev);
 }
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index 4c5ac7a69e9e..6a1e5876bb84 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -17,7 +17,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <mach/map.h>
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 84ec74633232..28e71efb388e 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 #include <linux/dma-mapping.h>
@@ -174,17 +174,18 @@ void __init s5pv210_init_irq(void)
         s5p_init_irq(vic, ARRAY_SIZE(vic));
 }
 
-struct sysdev_class s5pv210_sysclass = {
-        .name   = "s5pv210-core",
+struct bus_type s5pv210_subsys = {
+        .name           = "s5pv210-core",
+        .dev_name       = "s5pv210-core",
 };
 
-static struct sys_device s5pv210_sysdev = {
-        .cls    = &s5pv210_sysclass,
+static struct device s5pv210_dev = {
+        .bus    = &s5pv210_subsys,
 };
 
 static int __init s5pv210_core_init(void)
 {
-        return sysdev_class_register(&s5pv210_sysclass);
+        return subsys_system_register(&s5pv210_subsys, NULL);
 }
 
 core_initcall(s5pv210_core_init);
@@ -199,5 +200,5 @@ int __init s5pv210_init(void)
         /* set sw_reset function */
         s5p_reset_hook = s5pv210_sw_reset;
 
-        return sysdev_register(&s5pv210_sysdev);
+        return device_register(&s5pv210_dev);
 }
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
index f7266bb0cac8..05cf7dc61286 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/serial_core.h>
 #include <linux/i2c.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 8662ef6e5681..69a99db6cc83 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -13,7 +13,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/dm9000.h>
 #include <linux/fb.h>
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
index f149d278377b..677c71c41e50 100644
--- a/arch/arm/mach-s5pv210/pm.c
+++ b/arch/arm/mach-s5pv210/pm.c
@@ -133,7 +133,7 @@ static void s5pv210_pm_prepare(void)
         s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
 }
 
-static int s5pv210_pm_add(struct sys_device *sysdev)
+static int s5pv210_pm_add(struct device *dev)
 {
         pm_cpu_prep = s5pv210_pm_prepare;
         pm_cpu_sleep = s5pv210_cpu_suspend;
@@ -141,13 +141,15 @@ static int s5pv210_pm_add(struct sys_device *sysdev)
         return 0;
 }
 
-static struct sysdev_driver s5pv210_pm_driver = {
-        .add            = s5pv210_pm_add,
+static struct subsys_interface s5pv210_pm_interface = {
+        .name           = "s5pv210_pm",
+        .subsys         = &s5pv210_subsys,
+        .add_dev        = s5pv210_pm_add,
 };
 
 static __init int s5pv210_pm_drvinit(void)
 {
-        return sysdev_driver_register(&s5pv210_sysclass, &s5pv210_pm_driver);
+        return subsys_interface_register(&s5pv210_pm_interface);
 }
 arch_initcall(s5pv210_pm_drvinit);
 
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index e340a54251df..3a4893b82ad1 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -22,7 +22,6 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/irqdomain.h>
 #include <linux/of_address.h>
diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index fda4866703cd..07b9122ff84f 100644
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -21,7 +21,6 @@
 
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index feaf9cbe60f6..8d8b80e79e03 100644
--- a/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@ -21,7 +21,6 @@
 
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl061.h>
 #include <linux/amba/mmci.h>
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 1fafc3244607..de5a2384284b 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -10,7 +10,7 @@
 #include <linux/ata_platform.h>
 #include <linux/smsc911x.h>
 #include <linux/spinlock.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/usb/isp1760.h>
 #include <linux/clkdev.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-w90x900/irq.c b/arch/arm/mach-w90x900/irq.c
index 7bf143c443f1..f47e29586a01 100644
--- a/arch/arm/mach-w90x900/irq.c
+++ b/arch/arm/mach-w90x900/irq.c
@@ -19,7 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/ptrace.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <asm/irq.h>
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c
index bcc43f346272..084604be6ad1 100644
--- a/arch/arm/plat-s3c24xx/common-smdk.c
+++ b/arch/arm/plat-s3c24xx/common-smdk.c
@@ -19,7 +19,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/platform_device.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/plat-s3c24xx/cpu-freq.c b/arch/arm/plat-s3c24xx/cpu-freq.c
index b3d3d0278997..468079938884 100644
--- a/arch/arm/plat-s3c24xx/cpu-freq.c
+++ b/arch/arm/plat-s3c24xx/cpu-freq.c
@@ -20,7 +20,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/sysfs.h>
 #include <linux/slab.h>
 
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index fc8c5f89954d..bc42c04091fd 100644
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 
 #include <asm/irq.h>
diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c
index 663b280d65da..68296b1fe7e5 100644
--- a/arch/arm/plat-s3c24xx/pm-simtec.c
+++ b/arch/arm/plat-s3c24xx/pm-simtec.c
@@ -18,7 +18,6 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
 #include <linux/device.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/plat-s3c24xx/s3c2410-clock.c b/arch/arm/plat-s3c24xx/s3c2410-clock.c
index def76aa3825a..25dc4d4397b1 100644
--- a/arch/arm/plat-s3c24xx/s3c2410-clock.c
+++ b/arch/arm/plat-s3c24xx/s3c2410-clock.c
@@ -26,7 +26,7 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/mutex.h>
 #include <linux/delay.h>
diff --git a/arch/arm/plat-s3c24xx/s3c2412-iotiming.c b/arch/arm/plat-s3c24xx/s3c2412-iotiming.c
index 0b46d3895d62..48eee39ab369 100644
--- a/arch/arm/plat-s3c24xx/s3c2412-iotiming.c
+++ b/arch/arm/plat-s3c24xx/s3c2412-iotiming.c
@@ -17,7 +17,7 @@
 #include <linux/ioport.h>
 #include <linux/cpufreq.h>
 #include <linux/seq_file.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-s5p/clock.c
index 5f84a3f13ef9..963edea7f7e7 100644
--- a/arch/arm/plat-s5p/clock.c
+++ b/arch/arm/plat-s5p/clock.c
@@ -17,7 +17,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 #include <asm/div64.h>
 
diff --git a/arch/arm/plat-s5p/irq-eint.c b/arch/arm/plat-s5p/irq-eint.c
index b5bb774985b0..c496b359c371 100644
--- a/arch/arm/plat-s5p/irq-eint.c
+++ b/arch/arm/plat-s5p/irq-eint.c
@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/gpio.h>
 
 #include <asm/hardware/vic.h>
diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c
index ae8b8507663f..786a4107a157 100644
--- a/arch/arm/plat-samsung/clock-clksrc.c
+++ b/arch/arm/plat-samsung/clock-clksrc.c
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/io.h>
 
 #include <plat/clock.h>
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index 3b4451979d1b..10f71179071f 100644
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -33,7 +33,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/clk.h>
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
index 40fd7b6b5e66..0122a22eb732 100644
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@ -185,20 +185,20 @@ extern struct syscore_ops s3c2416_pm_syscore_ops;
 extern struct syscore_ops s3c244x_pm_syscore_ops;
 extern struct syscore_ops s3c64xx_irq_syscore_ops;
 
-/* system device classes */
-
-extern struct sysdev_class s3c2410_sysclass;
-extern struct sysdev_class s3c2410a_sysclass;
-extern struct sysdev_class s3c2412_sysclass;
-extern struct sysdev_class s3c2416_sysclass;
-extern struct sysdev_class s3c2440_sysclass;
-extern struct sysdev_class s3c2442_sysclass;
-extern struct sysdev_class s3c2443_sysclass;
-extern struct sysdev_class s3c6410_sysclass;
-extern struct sysdev_class s3c64xx_sysclass;
-extern struct sysdev_class s5p64x0_sysclass;
-extern struct sysdev_class s5pv210_sysclass;
-extern struct sysdev_class exynos4_sysclass;
+/* system device subsystems */
+
+extern struct bus_type s3c2410_subsys;
+extern struct bus_type s3c2410a_subsys;
+extern struct bus_type s3c2412_subsys;
+extern struct bus_type s3c2416_subsys;
+extern struct bus_type s3c2440_subsys;
+extern struct bus_type s3c2442_subsys;
+extern struct bus_type s3c2443_subsys;
+extern struct bus_type s3c6410_subsys;
+extern struct bus_type s3c64xx_subsys;
+extern struct bus_type s5p64x0_subsys;
+extern struct bus_type s5pv210_subsys;
+extern struct bus_type exynos4_subsys;
 
 extern void (*s5pc1xx_idle)(void);
 
diff --git a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
index 1c1ed5481253..d01576318b2c 100644
--- a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
+++ b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
@@ -12,7 +12,7 @@
 
 #include <plat/dma-core.h>
 
-extern struct sysdev_class dma_sysclass;
+extern struct bus_type dma_subsys;
 extern struct s3c2410_dma_chan s3c2410_chans[S3C_DMA_CHANNELS];
 
 #define DMA_CH_VALID            (1<<31)
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h
index dcf68709f9cf..78014e53eb3c 100644
--- a/arch/arm/plat-samsung/include/plat/pm.h
+++ b/arch/arm/plat-samsung/include/plat/pm.h
@@ -17,7 +17,7 @@
 
 #include <linux/irq.h>
 
-struct sys_device;
+struct device;
 
 #ifdef CONFIG_PM
 
diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
index 4be016eaa6db..c2ff92c30bdf 100644
--- a/arch/arm/plat-samsung/pm-gpio.c
+++ b/arch/arm/plat-samsung/pm-gpio.c
@@ -14,7 +14,7 @@
 */
 
 #include <linux/kernel.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
diff --git a/arch/arm/plat-samsung/wakeup-mask.c b/arch/arm/plat-samsung/wakeup-mask.c
index dc814037297b..20c3d9117cc2 100644
--- a/arch/arm/plat-samsung/wakeup-mask.c
+++ b/arch/arm/plat-samsung/wakeup-mask.c
@@ -11,7 +11,7 @@
 
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/types.h>
 #include <linux/irq.h>
 #include <linux/io.h>
diff --git a/arch/avr32/boards/merisc/merisc_sysfs.c b/arch/avr32/boards/merisc/merisc_sysfs.c
index df431fdba9ad..5a252318f4bd 100644
--- a/arch/avr32/boards/merisc/merisc_sysfs.c
+++ b/arch/avr32/boards/merisc/merisc_sysfs.c
@@ -13,7 +13,6 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/timer.h>
 #include <linux/err.h>
 #include <linux/ctype.h>
diff --git a/arch/avr32/kernel/cpu.c b/arch/avr32/kernel/cpu.c
index e84faffbbeca..2233be71e2e8 100644
--- a/arch/avr32/kernel/cpu.c
+++ b/arch/avr32/kernel/cpu.c
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/seq_file.h>
 #include <linux/cpu.h>
 #include <linux/module.h>
@@ -26,16 +26,16 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
  * XXX: If/when a SMP-capable implementation of AVR32 will ever be
  * made, we must make sure that the code executes on the correct CPU.
  */
-static ssize_t show_pc0event(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pc0event(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         unsigned long pccr;
 
         pccr = sysreg_read(PCCR);
         return sprintf(buf, "0x%lx\n", (pccr >> 12) & 0x3f);
 }
-static ssize_t store_pc0event(struct sys_device *dev,
-                        struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pc0event(struct device *dev,
+                        struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long val;
@@ -48,16 +48,16 @@ static ssize_t store_pc0event(struct sys_device *dev,
         sysreg_write(PCCR, val);
         return count;
 }
-static ssize_t show_pc0count(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pc0count(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         unsigned long pcnt0;
 
         pcnt0 = sysreg_read(PCNT0);
         return sprintf(buf, "%lu\n", pcnt0);
 }
-static ssize_t store_pc0count(struct sys_device *dev,
-                                struct sysdev_attribute *attr,
+static ssize_t store_pc0count(struct device *dev,
+                                struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
         unsigned long val;
@@ -71,16 +71,16 @@ static ssize_t store_pc0count(struct sys_device *dev,
         return count;
 }
 
-static ssize_t show_pc1event(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pc1event(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned long pccr;
 
         pccr = sysreg_read(PCCR);
         return sprintf(buf, "0x%lx\n", (pccr >> 18) & 0x3f);
 }
-static ssize_t store_pc1event(struct sys_device *dev,
-                              struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pc1event(struct device *dev,
+                              struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long val;
@@ -93,16 +93,16 @@ static ssize_t store_pc1event(struct sys_device *dev,
         sysreg_write(PCCR, val);
         return count;
 }
-static ssize_t show_pc1count(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pc1count(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned long pcnt1;
 
         pcnt1 = sysreg_read(PCNT1);
         return sprintf(buf, "%lu\n", pcnt1);
 }
-static ssize_t store_pc1count(struct sys_device *dev,
-                                struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pc1count(struct device *dev,
+                                struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long val;
@@ -116,16 +116,16 @@ static ssize_t store_pc1count(struct sys_device *dev,
         return count;
 }
 
-static ssize_t show_pccycles(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pccycles(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned long pccnt;
 
         pccnt = sysreg_read(PCCNT);
         return sprintf(buf, "%lu\n", pccnt);
 }
-static ssize_t store_pccycles(struct sys_device *dev,
-                                struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pccycles(struct device *dev,
+                                struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long val;
@@ -139,16 +139,16 @@ static ssize_t store_pccycles(struct sys_device *dev,
         return count;
 }
 
-static ssize_t show_pcenable(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pcenable(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         unsigned long pccr;
 
         pccr = sysreg_read(PCCR);
         return sprintf(buf, "%c\n", (pccr & 1)?'1':'0');
 }
-static ssize_t store_pcenable(struct sys_device *dev,
-                              struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pcenable(struct device *dev,
+                              struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long pccr, val;
@@ -167,12 +167,12 @@ static ssize_t store_pcenable(struct sys_device *dev,
         return count;
 }
 
-static SYSDEV_ATTR(pc0event, 0600, show_pc0event, store_pc0event);
-static SYSDEV_ATTR(pc0count, 0600, show_pc0count, store_pc0count);
-static SYSDEV_ATTR(pc1event, 0600, show_pc1event, store_pc1event);
-static SYSDEV_ATTR(pc1count, 0600, show_pc1count, store_pc1count);
-static SYSDEV_ATTR(pccycles, 0600, show_pccycles, store_pccycles);
-static SYSDEV_ATTR(pcenable, 0600, show_pcenable, store_pcenable);
+static DEVICE_ATTR(pc0event, 0600, show_pc0event, store_pc0event);
+static DEVICE_ATTR(pc0count, 0600, show_pc0count, store_pc0count);
+static DEVICE_ATTR(pc1event, 0600, show_pc1event, store_pc1event);
+static DEVICE_ATTR(pc1count, 0600, show_pc1count, store_pc1count);
+static DEVICE_ATTR(pccycles, 0600, show_pccycles, store_pccycles);
+static DEVICE_ATTR(pcenable, 0600, show_pcenable, store_pcenable);
 
 #endif /* CONFIG_PERFORMANCE_COUNTERS */
 
@@ -186,12 +186,12 @@ static int __init topology_init(void)
                 register_cpu(c, cpu);
 
 #ifdef CONFIG_PERFORMANCE_COUNTERS
-                sysdev_create_file(&c->sysdev, &attr_pc0event);
-                sysdev_create_file(&c->sysdev, &attr_pc0count);
-                sysdev_create_file(&c->sysdev, &attr_pc1event);
-                sysdev_create_file(&c->sysdev, &attr_pc1count);
-                sysdev_create_file(&c->sysdev, &attr_pccycles);
-                sysdev_create_file(&c->sysdev, &attr_pcenable);
+                device_create_file(&c->dev, &dev_attr_pc0event);
+                device_create_file(&c->dev, &dev_attr_pc0count);
+                device_create_file(&c->dev, &dev_attr_pc1event);
+                device_create_file(&c->dev, &dev_attr_pc1count);
+                device_create_file(&c->dev, &dev_attr_pccycles);
+                device_create_file(&c->dev, &dev_attr_pcenable);
 #endif
         }
 
diff --git a/arch/avr32/kernel/irq.c b/arch/avr32/kernel/irq.c
index bc3aa18293df..900e49b2258b 100644
--- a/arch/avr32/kernel/irq.c
+++ b/arch/avr32/kernel/irq.c
@@ -14,7 +14,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 
 /* May be overridden by platform code */
 int __weak nmi_enable(void)
diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
index c539c689493b..2d67317a1ec2 100644
--- a/arch/ia64/kernel/err_inject.c
+++ b/arch/ia64/kernel/err_inject.c
@@ -24,7 +24,7 @@
  * Copyright (C) 2006, Intel Corp.  All rights reserved.
  *
  */
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/cpu.h>
@@ -35,10 +35,10 @@
 #define ERR_DATA_BUFFER_SIZE 3          // Three 8-byte;
 
 #define define_one_ro(name)                                             \
-static SYSDEV_ATTR(name, 0444, show_##name, NULL)
+static DEVICE_ATTR(name, 0444, show_##name, NULL)
 
 #define define_one_rw(name)                                             \
-static SYSDEV_ATTR(name, 0644, show_##name, store_##name)
+static DEVICE_ATTR(name, 0644, show_##name, store_##name)
 
 static u64 call_start[NR_CPUS];
 static u64 phys_addr[NR_CPUS];
@@ -55,7 +55,7 @@ static u64 resources[NR_CPUS];
 
 #define show(name)                                                      \
 static ssize_t                                                          \
-show_##name(struct sys_device *dev, struct sysdev_attribute *attr,      \
+show_##name(struct device *dev, struct device_attribute *attr,  \
                 char *buf)                                              \
 {                                                                       \
         u32 cpu=dev->id;                                                \
@@ -64,7 +64,7 @@ show_##name(struct sys_device *dev, struct sysdev_attribute *attr,	\
 
 #define store(name)                                                     \
 static ssize_t                                                          \
-store_##name(struct sys_device *dev, struct sysdev_attribute *attr,     \
+store_##name(struct device *dev, struct device_attribute *attr, \
                                         const char *buf, size_t size)   \
 {                                                                       \
         unsigned int cpu=dev->id;                                       \
@@ -78,7 +78,7 @@ show(call_start)
  * processor. The cpu number in driver is only used for storing data.
  */
 static ssize_t
-store_call_start(struct sys_device *dev, struct sysdev_attribute *attr,
+store_call_start(struct device *dev, struct device_attribute *attr,
                 const char *buf, size_t size)
 {
         unsigned int cpu=dev->id;
@@ -127,7 +127,7 @@ show(err_type_info)
 store(err_type_info)
 
 static ssize_t
-show_virtual_to_phys(struct sys_device *dev, struct sysdev_attribute *attr,
+show_virtual_to_phys(struct device *dev, struct device_attribute *attr,
                         char *buf)
 {
         unsigned int cpu=dev->id;
@@ -135,7 +135,7 @@ show_virtual_to_phys(struct sys_device *dev, struct sysdev_attribute *attr,
 }
 
 static ssize_t
-store_virtual_to_phys(struct sys_device *dev, struct sysdev_attribute *attr,
+store_virtual_to_phys(struct device *dev, struct device_attribute *attr,
                         const char *buf, size_t size)
 {
         unsigned int cpu=dev->id;
@@ -159,8 +159,8 @@ show(err_struct_info)
 store(err_struct_info)
 
 static ssize_t
-show_err_data_buffer(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+show_err_data_buffer(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         unsigned int cpu=dev->id;
 
@@ -171,8 +171,8 @@ show_err_data_buffer(struct sys_device *dev,
 }
 
 static ssize_t
-store_err_data_buffer(struct sys_device *dev,
-                        struct sysdev_attribute *attr,
+store_err_data_buffer(struct device *dev,
+                        struct device_attribute *attr,
                         const char *buf, size_t size)
 {
         unsigned int cpu=dev->id;
@@ -209,14 +209,14 @@ define_one_ro(capabilities);
 define_one_ro(resources);
 
 static struct attribute *default_attrs[] = {
-        &attr_call_start.attr,
-        &attr_virtual_to_phys.attr,
-        &attr_err_type_info.attr,
-        &attr_err_struct_info.attr,
-        &attr_err_data_buffer.attr,
-        &attr_status.attr,
-        &attr_capabilities.attr,
-        &attr_resources.attr,
+        &dev_attr_call_start.attr,
+        &dev_attr_virtual_to_phys.attr,
+        &dev_attr_err_type_info.attr,
+        &dev_attr_err_struct_info.attr,
+        &dev_attr_err_data_buffer.attr,
+        &dev_attr_status.attr,
+        &dev_attr_capabilities.attr,
+        &dev_attr_resources.attr,
         NULL
 };
 
@@ -225,12 +225,12 @@ static struct attribute_group err_inject_attr_group = {
         .name = "err_inject"
 };
 /* Add/Remove err_inject interface for CPU device */
-static int __cpuinit err_inject_add_dev(struct sys_device * sys_dev)
+static int __cpuinit err_inject_add_dev(struct device * sys_dev)
 {
         return sysfs_create_group(&sys_dev->kobj, &err_inject_attr_group);
 }
 
-static int __cpuinit err_inject_remove_dev(struct sys_device * sys_dev)
+static int __cpuinit err_inject_remove_dev(struct device * sys_dev)
 {
         sysfs_remove_group(&sys_dev->kobj, &err_inject_attr_group);
         return 0;
@@ -239,9 +239,9 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,
                 unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
-        struct sys_device *sys_dev;
+        struct device *sys_dev;
 
-        sys_dev = get_cpu_sysdev(cpu);
+        sys_dev = get_cpu_device(cpu);
         switch (action) {
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
@@ -283,13 +283,13 @@ static void __exit
 err_inject_exit(void)
 {
         int i;
-        struct sys_device *sys_dev;
+        struct device *sys_dev;
 
 #ifdef ERR_INJ_DEBUG
         printk(KERN_INFO "Exit error injection driver.\n");
 #endif
         for_each_online_cpu(i) {
-                sys_dev = get_cpu_sysdev(i);
+                sys_dev = get_cpu_device(i);
                 sysfs_remove_group(&sys_dev->kobj, &err_inject_attr_group);
         }
         unregister_hotcpu_notifier(&err_inject_cpu_notifier);
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 9be1f11a01d9..9deb21dbf629 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -350,7 +350,7 @@ static int __cpuinit cpu_cache_sysfs_init(unsigned int cpu)
 }
 
 /* Add cache interface for CPU device */
-static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
+static int __cpuinit cache_add_dev(struct device * sys_dev)
 {
         unsigned int cpu = sys_dev->id;
         unsigned long i, j;
@@ -400,7 +400,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
 }
 
 /* Remove cache interface for CPU device */
-static int __cpuinit cache_remove_dev(struct sys_device * sys_dev)
+static int __cpuinit cache_remove_dev(struct device * sys_dev)
 {
         unsigned int cpu = sys_dev->id;
         unsigned long i;
@@ -428,9 +428,9 @@ static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,
                 unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
-        struct sys_device *sys_dev;
+        struct device *sys_dev;
 
-        sys_dev = get_cpu_sysdev(cpu);
+        sys_dev = get_cpu_device(cpu);
         switch (action) {
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
@@ -454,7 +454,7 @@ static int __init cache_sysfs_init(void)
         int i;
 
         for_each_online_cpu(i) {
-                struct sys_device *sys_dev = get_cpu_sysdev((unsigned int)i);
+                struct device *sys_dev = get_cpu_device((unsigned int)i);
                 cache_add_dev(sys_dev);
         }
 
diff --git a/arch/m68k/platform/coldfire/gpio.c b/arch/m68k/platform/coldfire/gpio.c
index ff0045793450..292a1a5a2d7c 100644
--- a/arch/m68k/platform/coldfire/gpio.c
+++ b/arch/m68k/platform/coldfire/gpio.c
@@ -15,7 +15,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 
 #include <asm/gpio.h>
 #include <asm/pinmux.h>
@@ -115,13 +115,14 @@ void mcf_gpio_free(struct gpio_chip *chip, unsigned offset)
                 mcf_pinmux_release(mcf_chip->gpio_to_pinmux[offset], 0);
 }
 
-struct sysdev_class mcf_gpio_sysclass = {
-        .name   = "gpio",
+struct bus_type mcf_gpio_subsys = {
+        .name           = "gpio",
+        .dev_name       = "gpio",
 };
 
 static int __init mcf_gpio_sysinit(void)
 {
-        return sysdev_class_register(&mcf_gpio_sysclass);
+        return subsys_system_register(&mcf_gpio_subsys, NULL);
 }
 
 core_initcall(mcf_gpio_sysinit);
diff --git a/arch/mips/txx9/generic/7segled.c b/arch/mips/txx9/generic/7segled.c
index 7f8416f86222..8e93b2122524 100644
--- a/arch/mips/txx9/generic/7segled.c
+++ b/arch/mips/txx9/generic/7segled.c
@@ -9,7 +9,7 @@
  * (C) Copyright TOSHIBA CORPORATION 2005-2007
  * All Rights Reserved.
  */
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/map_to_7segment.h>
 #include <asm/txx9/generic.h>
@@ -37,8 +37,8 @@ int txx9_7segled_putc(unsigned int pos, char c)
         return 0;
 }
 
-static ssize_t ascii_store(struct sys_device *dev,
-                           struct sysdev_attribute *attr,
+static ssize_t ascii_store(struct device *dev,
+                           struct device_attribute *attr,
                            const char *buf, size_t size)
 {
         unsigned int ch = dev->id;
@@ -46,8 +46,8 @@ static ssize_t ascii_store(struct sys_device *dev,
         return size;
 }
 
-static ssize_t raw_store(struct sys_device *dev,
-                         struct sysdev_attribute *attr,
+static ssize_t raw_store(struct device *dev,
+                         struct device_attribute *attr,
                          const char *buf, size_t size)
 {
         unsigned int ch = dev->id;
@@ -55,19 +55,19 @@ static ssize_t raw_store(struct sys_device *dev,
         return size;
 }
 
-static SYSDEV_ATTR(ascii, 0200, NULL, ascii_store);
-static SYSDEV_ATTR(raw, 0200, NULL, raw_store);
+static DEVICE_ATTR(ascii, 0200, NULL, ascii_store);
+static DEVICE_ATTR(raw, 0200, NULL, raw_store);
 
-static ssize_t map_seg7_show(struct sysdev_class *class,
-                             struct sysdev_class_attribute *attr,
+static ssize_t map_seg7_show(struct device *dev,
+                             struct device_attribute *attr,
                              char *buf)
 {
         memcpy(buf, &txx9_seg7map, sizeof(txx9_seg7map));
         return sizeof(txx9_seg7map);
 }
 
-static ssize_t map_seg7_store(struct sysdev_class *class,
-                              struct sysdev_class_attribute *attr,
+static ssize_t map_seg7_store(struct device *dev,
+                              struct device_attribute *attr,
                               const char *buf, size_t size)
 {
         if (size != sizeof(txx9_seg7map))
@@ -76,10 +76,11 @@ static ssize_t map_seg7_store(struct sysdev_class *class,
         return size;
 }
 
-static SYSDEV_CLASS_ATTR(map_seg7, 0600, map_seg7_show, map_seg7_store);
+static DEVICE_ATTR(map_seg7, 0600, map_seg7_show, map_seg7_store);
 
-static struct sysdev_class tx_7segled_sysdev_class = {
-        .name   = "7segled",
+static struct bus_type tx_7segled_subsys = {
+        .name           = "7segled",
+        .dev_name       = "7segled",
 };
 
 static int __init tx_7segled_init_sysfs(void)
@@ -87,26 +88,25 @@ static int __init tx_7segled_init_sysfs(void)
         int error, i;
         if (!tx_7segled_num)
                 return -ENODEV;
-        error = sysdev_class_register(&tx_7segled_sysdev_class);
+        error = subsys_system_register(&tx_7segled_subsys, NULL);
         if (error)
                 return error;
-        error = sysdev_class_create_file(&tx_7segled_sysdev_class,
-                                         &attr_map_seg7);
+        error = device_create_file(tx_7segled_subsys.dev_root, &dev_attr_map_seg7);
         if (error)
                 return error;
         for (i = 0; i < tx_7segled_num; i++) {
-                struct sys_device *dev;
+                struct device *dev;
                 dev = kzalloc(sizeof(*dev), GFP_KERNEL);
                 if (!dev) {
                         error = -ENODEV;
                         break;
                 }
                 dev->id = i;
-                dev->cls = &tx_7segled_sysdev_class;
-                error = sysdev_register(dev);
+                dev->dev = &tx_7segled_subsys;
+                error = device_register(dev);
                 if (!error) {
-                        sysdev_create_file(dev, &attr_ascii);
-                        sysdev_create_file(dev, &attr_raw);
+                        device_create_file(dev, &dev_attr_ascii);
+                        device_create_file(dev, &dev_attr_raw);
                 }
         }
         return error;
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index ec38e00b2559..ae77a7916c03 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -22,7 +22,7 @@
 #include <linux/serial_core.h>
 #include <linux/mtd/physmap.h>
 #include <linux/leds.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/irq.h>
 #include <asm/bootinfo.h>
@@ -897,10 +897,13 @@ void __init txx9_aclc_init(unsigned long baseaddr, int irq,
 #endif
 }
 
-static struct sysdev_class txx9_sramc_sysdev_class;
+static struct bus_type txx9_sramc_subsys = {
+        .name = "txx9_sram",
+        .dev_name = "txx9_sram",
+};
 
-struct txx9_sramc_sysdev {
-        struct sys_device dev;
+struct txx9_sramc_dev {
+        struct device dev;
         struct bin_attribute bindata_attr;
         void __iomem *base;
 };
@@ -909,7 +912,7 @@ static ssize_t txx9_sram_read(struct file *filp, struct kobject *kobj,
                               struct bin_attribute *bin_attr,
                               char *buf, loff_t pos, size_t size)
 {
-        struct txx9_sramc_sysdev *dev = bin_attr->private;
+        struct txx9_sramc_dev *dev = bin_attr->private;
         size_t ramsize = bin_attr->size;
 
         if (pos >= ramsize)
@@ -924,7 +927,7 @@ static ssize_t txx9_sram_write(struct file *filp, struct kobject *kobj,
                                struct bin_attribute *bin_attr,
                                char *buf, loff_t pos, size_t size)
 {
-        struct txx9_sramc_sysdev *dev = bin_attr->private;
+        struct txx9_sramc_dev *dev = bin_attr->private;
         size_t ramsize = bin_attr->size;
 
         if (pos >= ramsize)
@@ -937,18 +940,13 @@ static ssize_t txx9_sram_write(struct file *filp, struct kobject *kobj,
 
 void __init txx9_sramc_init(struct resource *r)
 {
-        struct txx9_sramc_sysdev *dev;
+        struct txx9_sramc_dev *dev;
         size_t size;
         int err;
 
-        if (!txx9_sramc_sysdev_class.name) {
-                txx9_sramc_sysdev_class.name = "txx9_sram";
-                err = sysdev_class_register(&txx9_sramc_sysdev_class);
-                if (err) {
-                        txx9_sramc_sysdev_class.name = NULL;
-                        return;
-                }
-        }
+        err = subsys_system_register(&txx9_sramc_subsys, NULL);
+        if (err)
+                return;
         dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return;
@@ -956,7 +954,7 @@ void __init txx9_sramc_init(struct resource *r)
         dev->base = ioremap(r->start, size);
         if (!dev->base)
                 goto exit;
-        dev->dev.cls = &txx9_sramc_sysdev_class;
+        dev->dev.bus = &txx9_sramc_subsys;
         sysfs_bin_attr_init(&dev->bindata_attr);
         dev->bindata_attr.attr.name = "bindata";
         dev->bindata_attr.attr.mode = S_IRUSR | S_IWUSR;
@@ -964,12 +962,12 @@ void __init txx9_sramc_init(struct resource *r)
         dev->bindata_attr.write = txx9_sram_write;
         dev->bindata_attr.size = size;
         dev->bindata_attr.private = dev;
-        err = sysdev_register(&dev->dev);
+        err = device_register(&dev->dev);
         if (err)
                 goto exit;
         err = sysfs_create_bin_file(&dev->dev.kobj, &dev->bindata_attr);
         if (err) {
-                sysdev_unregister(&dev->dev);
+                device_unregister(&dev->dev);
                 goto exit;
         }
         return;
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index ba3cec3155df..6567895d1f59 100644
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -15,7 +15,7 @@
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/notifier.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/ethtool.h>
 #include <linux/param.h>
 #include <linux/ptrace.h>
diff --git a/arch/powerpc/include/asm/spu.h b/arch/powerpc/include/asm/spu.h
index 4e360bd4a35a..fff921345ddc 100644
--- a/arch/powerpc/include/asm/spu.h
+++ b/arch/powerpc/include/asm/spu.h
@@ -25,7 +25,7 @@
 #ifdef __KERNEL__
 
 #include <linux/workqueue.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/mutex.h>
 
 #define LS_SIZE (256 * 1024)
@@ -166,7 +166,7 @@ struct spu {
         /* beat only */
         u64 shadow_int_mask_RW[3];
 
-        struct sys_device sysdev;
+        struct device dev;
 
         int has_mem_affinity;
         struct list_head aff_list;
@@ -270,11 +270,11 @@ struct spufs_calls {
 int register_spu_syscalls(struct spufs_calls *calls);
 void unregister_spu_syscalls(struct spufs_calls *calls);
 
-int spu_add_sysdev_attr(struct sysdev_attribute *attr);
-void spu_remove_sysdev_attr(struct sysdev_attribute *attr);
+int spu_add_dev_attr(struct device_attribute *attr);
+void spu_remove_dev_attr(struct device_attribute *attr);
 
-int spu_add_sysdev_attr_group(struct attribute_group *attrs);
-void spu_remove_sysdev_attr_group(struct attribute_group *attrs);
+int spu_add_dev_attr_group(struct attribute_group *attrs);
+void spu_remove_dev_attr_group(struct attribute_group *attrs);
 
 int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea,
                 unsigned long dsisr, unsigned *flt);
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index 1e104af08483..c97185885c6d 100644
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -3,7 +3,7 @@
 #ifdef __KERNEL__
 
 
-struct sys_device;
+struct device;
 struct device_node;
 
 #ifdef CONFIG_NUMA
@@ -86,19 +86,19 @@ extern int __node_distance(int, int);
 
 extern void __init dump_numa_cpu_topology(void);
 
-extern int sysfs_add_device_to_node(struct sys_device *dev, int nid);
-extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid);
+extern int sysfs_add_device_to_node(struct device *dev, int nid);
+extern void sysfs_remove_device_from_node(struct device *dev, int nid);
 
 #else
 
 static inline void dump_numa_cpu_topology(void) {}
 
-static inline int sysfs_add_device_to_node(struct sys_device *dev, int nid)
+static inline int sysfs_add_device_to_node(struct device *dev, int nid)
 {
         return 0;
 }
 
-static inline void sysfs_remove_device_from_node(struct sys_device *dev,
+static inline void sysfs_remove_device_from_node(struct device *dev,
                                                 int nid)
 {
 }
diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
index a3c684b4c862..92c6b008dd2b 100644
--- a/arch/powerpc/kernel/cacheinfo.c
+++ b/arch/powerpc/kernel/cacheinfo.c
@@ -451,15 +451,15 @@ out:
 static struct cache_dir *__cpuinit cacheinfo_create_cache_dir(unsigned int cpu_id)
 {
         struct cache_dir *cache_dir;
-        struct sys_device *sysdev;
+        struct device *dev;
         struct kobject *kobj = NULL;
 
-        sysdev = get_cpu_sysdev(cpu_id);
-        WARN_ONCE(!sysdev, "no sysdev for CPU %i\n", cpu_id);
-        if (!sysdev)
+        dev = get_cpu_device(cpu_id);
+        WARN_ONCE(!dev, "no dev for CPU %i\n", cpu_id);
+        if (!dev)
                 goto err;
 
-        kobj = kobject_create_and_add("cache", &sysdev->kobj);
+        kobj = kobject_create_and_add("cache", &dev->kobj);
         if (!kobj)
                 goto err;
 
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 6df70907d60a..d9a7a464ec51 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -27,7 +27,7 @@
 #include <linux/spinlock.h>
 #include <linux/cache.h>
 #include <linux/err.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/notifier.h>
 #include <linux/topology.h>
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index ce035c1905f0..5e7c1655f13a 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -1,4 +1,4 @@
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/smp.h>
 #include <linux/percpu.h>
@@ -37,12 +37,12 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
 /* Time in microseconds we delay before sleeping in the idle loop */
 DEFINE_PER_CPU(long, smt_snooze_delay) = { 100 };
 
-static ssize_t store_smt_snooze_delay(struct sys_device *dev,
-                                      struct sysdev_attribute *attr,
+static ssize_t store_smt_snooze_delay(struct device *dev,
+                                      struct device_attribute *attr,
                                       const char *buf,
                                       size_t count)
 {
-        struct cpu *cpu = container_of(dev, struct cpu, sysdev);
+        struct cpu *cpu = container_of(dev, struct cpu, dev);
         ssize_t ret;
         long snooze;
 
@@ -50,21 +50,21 @@ static ssize_t store_smt_snooze_delay(struct sys_device *dev,
         if (ret != 1)
                 return -EINVAL;
 
-        per_cpu(smt_snooze_delay, cpu->sysdev.id) = snooze;
+        per_cpu(smt_snooze_delay, cpu->dev.id) = snooze;
 
         return count;
 }
 
-static ssize_t show_smt_snooze_delay(struct sys_device *dev,
-                                     struct sysdev_attribute *attr,
+static ssize_t show_smt_snooze_delay(struct device *dev,
+                                     struct device_attribute *attr,
                                      char *buf)
 {
-        struct cpu *cpu = container_of(dev, struct cpu, sysdev);
+        struct cpu *cpu = container_of(dev, struct cpu, dev);
 
-        return sprintf(buf, "%ld\n", per_cpu(smt_snooze_delay, cpu->sysdev.id));
+        return sprintf(buf, "%ld\n", per_cpu(smt_snooze_delay, cpu->dev.id));
 }
 
-static SYSDEV_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay,
+static DEVICE_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay,
                    store_smt_snooze_delay);
 
 static int __init setup_smt_snooze_delay(char *str)
@@ -117,25 +117,25 @@ static void write_##NAME(void *val) \
         ppc_enable_pmcs(); \
         mtspr(ADDRESS, *(unsigned long *)val);  \
 } \
-static ssize_t show_##NAME(struct sys_device *dev, \
-                        struct sysdev_attribute *attr, \
+static ssize_t show_##NAME(struct device *dev, \
+                        struct device_attribute *attr, \
                         char *buf) \
 { \
-        struct cpu *cpu = container_of(dev, struct cpu, sysdev); \
+        struct cpu *cpu = container_of(dev, struct cpu, dev); \
         unsigned long val; \
-        smp_call_function_single(cpu->sysdev.id, read_##NAME, &val, 1); \
+        smp_call_function_single(cpu->dev.id, read_##NAME, &val, 1);    \
         return sprintf(buf, "%lx\n", val); \
 } \
 static ssize_t __used \
-        store_##NAME(struct sys_device *dev, struct sysdev_attribute *attr, \
+        store_##NAME(struct device *dev, struct device_attribute *attr, \
                         const char *buf, size_t count) \
 { \
-        struct cpu *cpu = container_of(dev, struct cpu, sysdev); \
+        struct cpu *cpu = container_of(dev, struct cpu, dev); \
         unsigned long val; \
         int ret = sscanf(buf, "%lx", &val); \
         if (ret != 1) \
                 return -EINVAL; \
-        smp_call_function_single(cpu->sysdev.id, write_##NAME, &val, 1); \
+        smp_call_function_single(cpu->dev.id, write_##NAME, &val, 1); \
         return count; \
 }
 
@@ -178,22 +178,22 @@ SYSFS_PMCSETUP(purr, SPRN_PURR);
 SYSFS_PMCSETUP(spurr, SPRN_SPURR);
 SYSFS_PMCSETUP(dscr, SPRN_DSCR);
 
-static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
-static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
-static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
-static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);
+static DEVICE_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
+static DEVICE_ATTR(spurr, 0600, show_spurr, NULL);
+static DEVICE_ATTR(dscr, 0600, show_dscr, store_dscr);
+static DEVICE_ATTR(purr, 0600, show_purr, store_purr);
 
 unsigned long dscr_default = 0;
 EXPORT_SYMBOL(dscr_default);
 
-static ssize_t show_dscr_default(struct sysdev_class *class,
-                struct sysdev_class_attribute *attr, char *buf)
+static ssize_t show_dscr_default(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
         return sprintf(buf, "%lx\n", dscr_default);
 }
 
-static ssize_t __used store_dscr_default(struct sysdev_class *class,
-                struct sysdev_class_attribute *attr, const char *buf,
+static ssize_t __used store_dscr_default(struct device *dev,
+                struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         unsigned long val;
@@ -207,15 +207,14 @@ static ssize_t __used store_dscr_default(struct sysdev_class *class,
         return count;
 }
 
-static SYSDEV_CLASS_ATTR(dscr_default, 0600,
+static DEVICE_ATTR(dscr_default, 0600,
                 show_dscr_default, store_dscr_default);
 
 static void sysfs_create_dscr_default(void)
 {
         int err = 0;
         if (cpu_has_feature(CPU_FTR_DSCR))
-                err = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
-                        &attr_dscr_default.attr);
+                err = device_create_file(cpu_subsys.dev_root, &dev_attr_dscr_default);
 }
 #endif /* CONFIG_PPC64 */
 
@@ -259,72 +258,72 @@ SYSFS_PMCSETUP(tsr3, SPRN_PA6T_TSR3);
 #endif /* HAS_PPC_PMC_PA6T */
 
 #ifdef HAS_PPC_PMC_IBM
-static struct sysdev_attribute ibm_common_attrs[] = {
-        _SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
-        _SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
+static struct device_attribute ibm_common_attrs[] = {
+        __ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
+        __ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
 };
 #endif /* HAS_PPC_PMC_G4 */
 
 #ifdef HAS_PPC_PMC_G4
-static struct sysdev_attribute g4_common_attrs[] = {
-        _SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
-        _SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
-        _SYSDEV_ATTR(mmcr2, 0600, show_mmcr2, store_mmcr2),
+static struct device_attribute g4_common_attrs[] = {
+        __ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
+        __ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
+        __ATTR(mmcr2, 0600, show_mmcr2, store_mmcr2),
 };
 #endif /* HAS_PPC_PMC_G4 */
 
-static struct sysdev_attribute classic_pmc_attrs[] = {
-        _SYSDEV_ATTR(pmc1, 0600, show_pmc1, store_pmc1),
-        _SYSDEV_ATTR(pmc2, 0600, show_pmc2, store_pmc2),
-        _SYSDEV_ATTR(pmc3, 0600, show_pmc3, store_pmc3),
-        _SYSDEV_ATTR(pmc4, 0600, show_pmc4, store_pmc4),
-        _SYSDEV_ATTR(pmc5, 0600, show_pmc5, store_pmc5),
-        _SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6),
+static struct device_attribute classic_pmc_attrs[] = {
+        __ATTR(pmc1, 0600, show_pmc1, store_pmc1),
+        __ATTR(pmc2, 0600, show_pmc2, store_pmc2),
+        __ATTR(pmc3, 0600, show_pmc3, store_pmc3),
+        __ATTR(pmc4, 0600, show_pmc4, store_pmc4),
+        __ATTR(pmc5, 0600, show_pmc5, store_pmc5),
+        __ATTR(pmc6, 0600, show_pmc6, store_pmc6),
 #ifdef CONFIG_PPC64
-        _SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7),
-        _SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8),
+        __ATTR(pmc7, 0600, show_pmc7, store_pmc7),
+        __ATTR(pmc8, 0600, show_pmc8, store_pmc8),
 #endif
 };
 
 #ifdef HAS_PPC_PMC_PA6T
-static struct sysdev_attribute pa6t_attrs[] = {
-        _SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
-        _SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
-        _SYSDEV_ATTR(pmc0, 0600, show_pa6t_pmc0, store_pa6t_pmc0),
-        _SYSDEV_ATTR(pmc1, 0600, show_pa6t_pmc1, store_pa6t_pmc1),
-        _SYSDEV_ATTR(pmc2, 0600, show_pa6t_pmc2, store_pa6t_pmc2),
-        _SYSDEV_ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),
-        _SYSDEV_ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),
-        _SYSDEV_ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),
+static struct device_attribute pa6t_attrs[] = {
+        __ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
+        __ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
+        __ATTR(pmc0, 0600, show_pa6t_pmc0, store_pa6t_pmc0),
+        __ATTR(pmc1, 0600, show_pa6t_pmc1, store_pa6t_pmc1),
+        __ATTR(pmc2, 0600, show_pa6t_pmc2, store_pa6t_pmc2),
+        __ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),
+        __ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),
+        __ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),
 #ifdef CONFIG_DEBUG_KERNEL
-        _SYSDEV_ATTR(hid0, 0600, show_hid0, store_hid0),
-        _SYSDEV_ATTR(hid1, 0600, show_hid1, store_hid1),
-        _SYSDEV_ATTR(hid4, 0600, show_hid4, store_hid4),
-        _SYSDEV_ATTR(hid5, 0600, show_hid5, store_hid5),
-        _SYSDEV_ATTR(ima0, 0600, show_ima0, store_ima0),
-        _SYSDEV_ATTR(ima1, 0600, show_ima1, store_ima1),
-        _SYSDEV_ATTR(ima2, 0600, show_ima2, store_ima2),
-        _SYSDEV_ATTR(ima3, 0600, show_ima3, store_ima3),
-        _SYSDEV_ATTR(ima4, 0600, show_ima4, store_ima4),
-        _SYSDEV_ATTR(ima5, 0600, show_ima5, store_ima5),
-        _SYSDEV_ATTR(ima6, 0600, show_ima6, store_ima6),
-        _SYSDEV_ATTR(ima7, 0600, show_ima7, store_ima7),
-        _SYSDEV_ATTR(ima8, 0600, show_ima8, store_ima8),
-        _SYSDEV_ATTR(ima9, 0600, show_ima9, store_ima9),
-        _SYSDEV_ATTR(imaat, 0600, show_imaat, store_imaat),
-        _SYSDEV_ATTR(btcr, 0600, show_btcr, store_btcr),
-        _SYSDEV_ATTR(pccr, 0600, show_pccr, store_pccr),
-        _SYSDEV_ATTR(rpccr, 0600, show_rpccr, store_rpccr),
-        _SYSDEV_ATTR(der, 0600, show_der, store_der),
-        _SYSDEV_ATTR(mer, 0600, show_mer, store_mer),
-        _SYSDEV_ATTR(ber, 0600, show_ber, store_ber),
-        _SYSDEV_ATTR(ier, 0600, show_ier, store_ier),
-        _SYSDEV_ATTR(sier, 0600, show_sier, store_sier),
-        _SYSDEV_ATTR(siar, 0600, show_siar, store_siar),
-        _SYSDEV_ATTR(tsr0, 0600, show_tsr0, store_tsr0),
-        _SYSDEV_ATTR(tsr1, 0600, show_tsr1, store_tsr1),
-        _SYSDEV_ATTR(tsr2, 0600, show_tsr2, store_tsr2),
-        _SYSDEV_ATTR(tsr3, 0600, show_tsr3, store_tsr3),
+        __ATTR(hid0, 0600, show_hid0, store_hid0),
+        __ATTR(hid1, 0600, show_hid1, store_hid1),
+        __ATTR(hid4, 0600, show_hid4, store_hid4),
+        __ATTR(hid5, 0600, show_hid5, store_hid5),
+        __ATTR(ima0, 0600, show_ima0, store_ima0),
+        __ATTR(ima1, 0600, show_ima1, store_ima1),
+        __ATTR(ima2, 0600, show_ima2, store_ima2),
+        __ATTR(ima3, 0600, show_ima3, store_ima3),
+        __ATTR(ima4, 0600, show_ima4, store_ima4),
+        __ATTR(ima5, 0600, show_ima5, store_ima5),
+        __ATTR(ima6, 0600, show_ima6, store_ima6),
+        __ATTR(ima7, 0600, show_ima7, store_ima7),
+        __ATTR(ima8, 0600, show_ima8, store_ima8),
+        __ATTR(ima9, 0600, show_ima9, store_ima9),
+        __ATTR(imaat, 0600, show_imaat, store_imaat),
+        __ATTR(btcr, 0600, show_btcr, store_btcr),
+        __ATTR(pccr, 0600, show_pccr, store_pccr),
+        __ATTR(rpccr, 0600, show_rpccr, store_rpccr),
+        __ATTR(der, 0600, show_der, store_der),
+        __ATTR(mer, 0600, show_mer, store_mer),
+        __ATTR(ber, 0600, show_ber, store_ber),
+        __ATTR(ier, 0600, show_ier, store_ier),
+        __ATTR(sier, 0600, show_sier, store_sier),
+        __ATTR(siar, 0600, show_siar, store_siar),
+        __ATTR(tsr0, 0600, show_tsr0, store_tsr0),
+        __ATTR(tsr1, 0600, show_tsr1, store_tsr1),
+        __ATTR(tsr2, 0600, show_tsr2, store_tsr2),
+        __ATTR(tsr3, 0600, show_tsr3, store_tsr3),
 #endif /* CONFIG_DEBUG_KERNEL */
 };
 #endif /* HAS_PPC_PMC_PA6T */
@@ -333,14 +332,14 @@ static struct sysdev_attribute pa6t_attrs[] = {
 static void __cpuinit register_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
-        struct sys_device *s = &c->sysdev;
-        struct sysdev_attribute *attrs, *pmc_attrs;
+        struct device *s = &c->dev;
+        struct device_attribute *attrs, *pmc_attrs;
         int i, nattrs;
 
 #ifdef CONFIG_PPC64
         if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
                         cpu_has_feature(CPU_FTR_SMT))
-                sysdev_create_file(s, &attr_smt_snooze_delay);
+                device_create_file(s, &dev_attr_smt_snooze_delay);
 #endif
 
         /* PMC stuff */
@@ -348,14 +347,14 @@ static void __cpuinit register_cpu_online(unsigned int cpu)
 #ifdef HAS_PPC_PMC_IBM
         case PPC_PMC_IBM:
                 attrs = ibm_common_attrs;
-                nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);
+                nattrs = sizeof(ibm_common_attrs) / sizeof(struct device_attribute);
                 pmc_attrs = classic_pmc_attrs;
                 break;
 #endif /* HAS_PPC_PMC_IBM */
 #ifdef HAS_PPC_PMC_G4
         case PPC_PMC_G4:
                 attrs = g4_common_attrs;
-                nattrs = sizeof(g4_common_attrs) / sizeof(struct sysdev_attribute);
+                nattrs = sizeof(g4_common_attrs) / sizeof(struct device_attribute);
                 pmc_attrs = classic_pmc_attrs;
                 break;
 #endif /* HAS_PPC_PMC_G4 */
@@ -363,7 +362,7 @@ static void __cpuinit register_cpu_online(unsigned int cpu)
         case PPC_PMC_PA6T:
                 /* PA Semi starts counting at PMC0 */
                 attrs = pa6t_attrs;
-                nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);
+                nattrs = sizeof(pa6t_attrs) / sizeof(struct device_attribute);
                 pmc_attrs = NULL;
                 break;
 #endif /* HAS_PPC_PMC_PA6T */
@@ -374,24 +373,24 @@ static void __cpuinit register_cpu_online(unsigned int cpu)
         }
 
         for (i = 0; i < nattrs; i++)
-                sysdev_create_file(s, &attrs[i]);
+                device_create_file(s, &attrs[i]);
 
         if (pmc_attrs)
                 for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
-                        sysdev_create_file(s, &pmc_attrs[i]);
+                        device_create_file(s, &pmc_attrs[i]);
 
 #ifdef CONFIG_PPC64
         if (cpu_has_feature(CPU_FTR_MMCRA))
-                sysdev_create_file(s, &attr_mmcra);
+                device_create_file(s, &dev_attr_mmcra);
 
         if (cpu_has_feature(CPU_FTR_PURR))
-                sysdev_create_file(s, &attr_purr);
+                device_create_file(s, &dev_attr_purr);
 
         if (cpu_has_feature(CPU_FTR_SPURR))
-                sysdev_create_file(s, &attr_spurr);
+                device_create_file(s, &dev_attr_spurr);
 
         if (cpu_has_feature(CPU_FTR_DSCR))
-                sysdev_create_file(s, &attr_dscr);
+                device_create_file(s, &dev_attr_dscr);
 #endif /* CONFIG_PPC64 */
 
         cacheinfo_cpu_online(cpu);
@@ -401,8 +400,8 @@ static void __cpuinit register_cpu_online(unsigned int cpu)
 static void unregister_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
-        struct sys_device *s = &c->sysdev;
-        struct sysdev_attribute *attrs, *pmc_attrs;
+        struct device *s = &c->dev;
+        struct device_attribute *attrs, *pmc_attrs;
         int i, nattrs;
 
         BUG_ON(!c->hotpluggable);
@@ -410,7 +409,7 @@ static void unregister_cpu_online(unsigned int cpu)
 #ifdef CONFIG_PPC64
         if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
                         cpu_has_feature(CPU_FTR_SMT))
-                sysdev_remove_file(s, &attr_smt_snooze_delay);
+                device_remove_file(s, &dev_attr_smt_snooze_delay);
 #endif
 
         /* PMC stuff */
@@ -418,14 +417,14 @@ static void unregister_cpu_online(unsigned int cpu)
 #ifdef HAS_PPC_PMC_IBM
         case PPC_PMC_IBM:
                 attrs = ibm_common_attrs;
-                nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);
+                nattrs = sizeof(ibm_common_attrs) / sizeof(struct device_attribute);
                 pmc_attrs = classic_pmc_attrs;
                 break;
 #endif /* HAS_PPC_PMC_IBM */
 #ifdef HAS_PPC_PMC_G4
         case PPC_PMC_G4:
                 attrs = g4_common_attrs;
-                nattrs = sizeof(g4_common_attrs) / sizeof(struct sysdev_attribute);
+                nattrs = sizeof(g4_common_attrs) / sizeof(struct device_attribute);
                 pmc_attrs = classic_pmc_attrs;
                 break;
 #endif /* HAS_PPC_PMC_G4 */
@@ -433,7 +432,7 @@ static void unregister_cpu_online(unsigned int cpu)
         case PPC_PMC_PA6T:
                 /* PA Semi starts counting at PMC0 */
                 attrs = pa6t_attrs;
-                nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);
+                nattrs = sizeof(pa6t_attrs) / sizeof(struct device_attribute);
                 pmc_attrs = NULL;
                 break;
 #endif /* HAS_PPC_PMC_PA6T */
@@ -444,24 +443,24 @@ static void unregister_cpu_online(unsigned int cpu)
         }
 
         for (i = 0; i < nattrs; i++)
-                sysdev_remove_file(s, &attrs[i]);
+                device_remove_file(s, &attrs[i]);
 
         if (pmc_attrs)
                 for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
-                        sysdev_remove_file(s, &pmc_attrs[i]);
+                        device_remove_file(s, &pmc_attrs[i]);
 
 #ifdef CONFIG_PPC64
         if (cpu_has_feature(CPU_FTR_MMCRA))
-                sysdev_remove_file(s, &attr_mmcra);
+                device_remove_file(s, &dev_attr_mmcra);
 
         if (cpu_has_feature(CPU_FTR_PURR))
-                sysdev_remove_file(s, &attr_purr);
+                device_remove_file(s, &dev_attr_purr);
 
         if (cpu_has_feature(CPU_FTR_SPURR))
-                sysdev_remove_file(s, &attr_spurr);
+                device_remove_file(s, &dev_attr_spurr);
 
         if (cpu_has_feature(CPU_FTR_DSCR))
-                sysdev_remove_file(s, &attr_dscr);
+                device_remove_file(s, &dev_attr_dscr);
 #endif /* CONFIG_PPC64 */
 
         cacheinfo_cpu_offline(cpu);
@@ -513,70 +512,70 @@ static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
 
 static DEFINE_MUTEX(cpu_mutex);
 
-int cpu_add_sysdev_attr(struct sysdev_attribute *attr)
+int cpu_add_dev_attr(struct device_attribute *attr)
 {
         int cpu;
 
         mutex_lock(&cpu_mutex);
 
         for_each_possible_cpu(cpu) {
-                sysdev_create_file(get_cpu_sysdev(cpu), attr);
+                device_create_file(get_cpu_device(cpu), attr);
         }
 
         mutex_unlock(&cpu_mutex);
         return 0;
 }
-EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr);
+EXPORT_SYMBOL_GPL(cpu_add_dev_attr);
 
-int cpu_add_sysdev_attr_group(struct attribute_group *attrs)
+int cpu_add_dev_attr_group(struct attribute_group *attrs)
 {
         int cpu;
-        struct sys_device *sysdev;
+        struct device *dev;
         int ret;
 
         mutex_lock(&cpu_mutex);
 
         for_each_possible_cpu(cpu) {
-                sysdev = get_cpu_sysdev(cpu);
-                ret = sysfs_create_group(&sysdev->kobj, attrs);
+                dev = get_cpu_device(cpu);
+                ret = sysfs_create_group(&dev->kobj, attrs);
                 WARN_ON(ret != 0);
         }
 
         mutex_unlock(&cpu_mutex);
         return 0;
 }
-EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr_group);
+EXPORT_SYMBOL_GPL(cpu_add_dev_attr_group);
 
 
-void cpu_remove_sysdev_attr(struct sysdev_attribute *attr)
+void cpu_remove_dev_attr(struct device_attribute *attr)
 {
         int cpu;
 
         mutex_lock(&cpu_mutex);
 
         for_each_possible_cpu(cpu) {
-                sysdev_remove_file(get_cpu_sysdev(cpu), attr);
+                device_remove_file(get_cpu_device(cpu), attr);
         }
 
         mutex_unlock(&cpu_mutex);
 }
-EXPORT_SYMBOL_GPL(cpu_remove_sysdev_attr);
+EXPORT_SYMBOL_GPL(cpu_remove_dev_attr);
 
-void cpu_remove_sysdev_attr_group(struct attribute_group *attrs)
+void cpu_remove_dev_attr_group(struct attribute_group *attrs)
 {
         int cpu;
-        struct sys_device *sysdev;
+        struct device *dev;
 
         mutex_lock(&cpu_mutex);
 
         for_each_possible_cpu(cpu) {
-                sysdev = get_cpu_sysdev(cpu);
-                sysfs_remove_group(&sysdev->kobj, attrs);
+                dev = get_cpu_device(cpu);
+                sysfs_remove_group(&dev->kobj, attrs);
         }
 
         mutex_unlock(&cpu_mutex);
 }
-EXPORT_SYMBOL_GPL(cpu_remove_sysdev_attr_group);
+EXPORT_SYMBOL_GPL(cpu_remove_dev_attr_group);
 
 
 /* NUMA stuff */
@@ -590,18 +589,18 @@ static void register_nodes(void)
                 register_one_node(i);
 }
 
-int sysfs_add_device_to_node(struct sys_device *dev, int nid)
+int sysfs_add_device_to_node(struct device *dev, int nid)
 {
         struct node *node = &node_devices[nid];
-        return sysfs_create_link(&node->sysdev.kobj, &dev->kobj,
+        return sysfs_create_link(&node->dev.kobj, &dev->kobj,
                         kobject_name(&dev->kobj));
 }
 EXPORT_SYMBOL_GPL(sysfs_add_device_to_node);
 
-void sysfs_remove_device_from_node(struct sys_device *dev, int nid)
+void sysfs_remove_device_from_node(struct device *dev, int nid)
 {
         struct node *node = &node_devices[nid];
-        sysfs_remove_link(&node->sysdev.kobj, kobject_name(&dev->kobj));
+        sysfs_remove_link(&node->dev.kobj, kobject_name(&dev->kobj));
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_device_from_node);
 
@@ -614,14 +613,14 @@ static void register_nodes(void)
 #endif
 
 /* Only valid if CPU is present. */
-static ssize_t show_physical_id(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_physical_id(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
-        struct cpu *cpu = container_of(dev, struct cpu, sysdev);
+        struct cpu *cpu = container_of(dev, struct cpu, dev);
 
-        return sprintf(buf, "%d\n", get_hard_smp_processor_id(cpu->sysdev.id));
+        return sprintf(buf, "%d\n", get_hard_smp_processor_id(cpu->dev.id));
 }
-static SYSDEV_ATTR(physical_id, 0444, show_physical_id, NULL);
+static DEVICE_ATTR(physical_id, 0444, show_physical_id, NULL);
 
 static int __init topology_init(void)
 {
@@ -646,7 +645,7 @@ static int __init topology_init(void)
                 if (cpu_online(cpu) || c->hotpluggable) {
                         register_cpu(c, cpu);
 
-                        sysdev_create_file(&c->sysdev, &attr_physical_id);
+                        device_create_file(&c->dev, &dev_attr_physical_id);
                 }
 
                 if (cpu_online(cpu))
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index b22a83a91cb8..b088e985bee2 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1462,7 +1462,7 @@ int arch_update_cpu_topology(void)
 {
         int cpu, nid, old_nid;
         unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0};
-        struct sys_device *sysdev;
+        struct device *dev;
 
         for_each_cpu(cpu,&cpu_associativity_changes_mask) {
                 vphn_get_associativity(cpu, associativity);
@@ -1483,9 +1483,9 @@ int arch_update_cpu_topology(void)
                 register_cpu_under_node(cpu, nid);
                 put_online_cpus();
 
-                sysdev = get_cpu_sysdev(cpu);
-                if (sysdev)
-                        kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
+                dev = get_cpu_device(cpu);
+                if (dev)
+                        kobject_uevent(&dev->kobj, KOBJ_CHANGE);
         }
 
         return 1;
diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c
index 4d4c8c169124..94560db788bf 100644
--- a/arch/powerpc/platforms/cell/cbe_thermal.c
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -46,7 +46,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/cpu.h>
 #include <asm/spu.h>
@@ -59,8 +59,8 @@
 #define TEMP_MIN 65
 #define TEMP_MAX 125
 
-#define SYSDEV_PREFIX_ATTR(_prefix,_name,_mode)                 \
-struct sysdev_attribute attr_ ## _prefix ## _ ## _name = {      \
+#define DEVICE_PREFIX_ATTR(_prefix,_name,_mode)                 \
+struct device_attribute attr_ ## _prefix ## _ ## _name = {      \
         .attr = { .name = __stringify(_name), .mode = _mode },  \
         .show   = _prefix ## _show_ ## _name,                   \
         .store  = _prefix ## _store_ ## _name,                  \
@@ -76,36 +76,36 @@ static inline u8 temp_to_reg(u8 temp)
         return ((temp - TEMP_MIN) >> 1) & 0x3f;
 }
 
-static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)
+static struct cbe_pmd_regs __iomem *get_pmd_regs(struct device *dev)
 {
         struct spu *spu;
 
-        spu = container_of(sysdev, struct spu, sysdev);
+        spu = container_of(dev, struct spu, dev);
 
         return cbe_get_pmd_regs(spu_devnode(spu));
 }
 
 /* returns the value for a given spu in a given register */
-static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg)
+static u8 spu_read_register_value(struct device *dev, union spe_reg __iomem *reg)
 {
         union spe_reg value;
         struct spu *spu;
 
-        spu = container_of(sysdev, struct spu, sysdev);
+        spu = container_of(dev, struct spu, dev);
         value.val = in_be64(&reg->val);
 
         return value.spe[spu->spe_id];
 }
 
-static ssize_t spu_show_temp(struct sys_device *sysdev, struct sysdev_attribute *attr,
+static ssize_t spu_show_temp(struct device *dev, struct device_attribute *attr,
                         char *buf)
 {
         u8 value;
         struct cbe_pmd_regs __iomem *pmd_regs;
 
-        pmd_regs = get_pmd_regs(sysdev);
+        pmd_regs = get_pmd_regs(dev);
 
-        value = spu_read_register_value(sysdev, &pmd_regs->ts_ctsr1);
+        value = spu_read_register_value(dev, &pmd_regs->ts_ctsr1);
 
         return sprintf(buf, "%d\n", reg_to_temp(value));
 }
@@ -147,48 +147,48 @@ static ssize_t store_throttle(struct cbe_pmd_regs __iomem *pmd_regs, const char
         return size;
 }
 
-static ssize_t spu_show_throttle_end(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t spu_show_throttle_end(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return show_throttle(get_pmd_regs(sysdev), buf, 0);
+        return show_throttle(get_pmd_regs(dev), buf, 0);
 }
 
-static ssize_t spu_show_throttle_begin(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t spu_show_throttle_begin(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return show_throttle(get_pmd_regs(sysdev), buf, 8);
+        return show_throttle(get_pmd_regs(dev), buf, 8);
 }
 
-static ssize_t spu_show_throttle_full_stop(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t spu_show_throttle_full_stop(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return show_throttle(get_pmd_regs(sysdev), buf, 16);
+        return show_throttle(get_pmd_regs(dev), buf, 16);
 }
 
-static ssize_t spu_store_throttle_end(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t spu_store_throttle_end(struct device *dev,
+                        struct device_attribute *attr, const char *buf, size_t size)
 {
-        return store_throttle(get_pmd_regs(sysdev), buf, size, 0);
+        return store_throttle(get_pmd_regs(dev), buf, size, 0);
 }
 
-static ssize_t spu_store_throttle_begin(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t spu_store_throttle_begin(struct device *dev,
+                        struct device_attribute *attr, const char *buf, size_t size)
 {
-        return store_throttle(get_pmd_regs(sysdev), buf, size, 8);
+        return store_throttle(get_pmd_regs(dev), buf, size, 8);
 }
 
-static ssize_t spu_store_throttle_full_stop(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t spu_store_throttle_full_stop(struct device *dev,
+                        struct device_attribute *attr, const char *buf, size_t size)
 {
-        return store_throttle(get_pmd_regs(sysdev), buf, size, 16);
+        return store_throttle(get_pmd_regs(dev), buf, size, 16);
 }
 
-static ssize_t ppe_show_temp(struct sys_device *sysdev, char *buf, int pos)
+static ssize_t ppe_show_temp(struct device *dev, char *buf, int pos)
 {
         struct cbe_pmd_regs __iomem *pmd_regs;
         u64 value;
 
-        pmd_regs = cbe_get_cpu_pmd_regs(sysdev->id);
+        pmd_regs = cbe_get_cpu_pmd_regs(dev->id);
         value = in_be64(&pmd_regs->ts_ctsr2);
 
         value = (value >> pos) & 0x3f;
@@ -199,64 +199,64 @@ static ssize_t ppe_show_temp(struct sys_device *sysdev, char *buf, int pos)
 
 /* shows the temperature of the DTS on the PPE,
  * located near the linear thermal sensor */
-static ssize_t ppe_show_temp0(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_temp0(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return ppe_show_temp(sysdev, buf, 32);
+        return ppe_show_temp(dev, buf, 32);
 }
 
 /* shows the temperature of the second DTS on the PPE */
-static ssize_t ppe_show_temp1(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_temp1(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return ppe_show_temp(sysdev, buf, 0);
+        return ppe_show_temp(dev, buf, 0);
 }
 
-static ssize_t ppe_show_throttle_end(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_throttle_end(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return show_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, 32);
+        return show_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, 32);
 }
 
-static ssize_t ppe_show_throttle_begin(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_throttle_begin(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return show_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, 40);
+        return show_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, 40);
 }
 
-static ssize_t ppe_show_throttle_full_stop(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_throttle_full_stop(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return show_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, 48);
+        return show_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, 48);
 }
 
-static ssize_t ppe_store_throttle_end(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t ppe_store_throttle_end(struct device *dev,
+                        struct device_attribute *attr, const char *buf, size_t size)
 {
-        return store_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, size, 32);
+        return store_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, size, 32);
 }
 
-static ssize_t ppe_store_throttle_begin(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t ppe_store_throttle_begin(struct device *dev,
+                        struct device_attribute *attr, const char *buf, size_t size)
 {
-        return store_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, size, 40);
+        return store_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, size, 40);
 }
 
-static ssize_t ppe_store_throttle_full_stop(struct sys_device *sysdev,
-                        struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t ppe_store_throttle_full_stop(struct device *dev,
+                        struct device_attribute *attr, const char *buf, size_t size)
 {
-        return store_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, size, 48);
+        return store_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, size, 48);
 }
 
 
-static struct sysdev_attribute attr_spu_temperature = {
+static struct device_attribute attr_spu_temperature = {
         .attr = {.name = "temperature", .mode = 0400 },
         .show = spu_show_temp,
 };
 
-static SYSDEV_PREFIX_ATTR(spu, throttle_end, 0600);
-static SYSDEV_PREFIX_ATTR(spu, throttle_begin, 0600);
-static SYSDEV_PREFIX_ATTR(spu, throttle_full_stop, 0600);
+static DEVICE_PREFIX_ATTR(spu, throttle_end, 0600);
+static DEVICE_PREFIX_ATTR(spu, throttle_begin, 0600);
+static DEVICE_PREFIX_ATTR(spu, throttle_full_stop, 0600);
 
 
 static struct attribute *spu_attributes[] = {
@@ -272,19 +272,19 @@ static struct attribute_group spu_attribute_group = {
         .attrs  = spu_attributes,
 };
 
-static struct sysdev_attribute attr_ppe_temperature0 = {
+static struct device_attribute attr_ppe_temperature0 = {
         .attr = {.name = "temperature0", .mode = 0400 },
         .show = ppe_show_temp0,
 };
 
-static struct sysdev_attribute attr_ppe_temperature1 = {
+static struct device_attribute attr_ppe_temperature1 = {
         .attr = {.name = "temperature1", .mode = 0400 },
         .show = ppe_show_temp1,
 };
 
-static SYSDEV_PREFIX_ATTR(ppe, throttle_end, 0600);
-static SYSDEV_PREFIX_ATTR(ppe, throttle_begin, 0600);
-static SYSDEV_PREFIX_ATTR(ppe, throttle_full_stop, 0600);
+static DEVICE_PREFIX_ATTR(ppe, throttle_end, 0600);
+static DEVICE_PREFIX_ATTR(ppe, throttle_begin, 0600);
+static DEVICE_PREFIX_ATTR(ppe, throttle_full_stop, 0600);
 
 static struct attribute *ppe_attributes[] = {
         &attr_ppe_temperature0.attr,
@@ -307,7 +307,7 @@ static int __init init_default_values(void)
 {
         int cpu;
         struct cbe_pmd_regs __iomem *pmd_regs;
-        struct sys_device *sysdev;
+        struct device *dev;
         union ppe_spe_reg tpr;
         union spe_reg str1;
         u64 str2;
@@ -349,14 +349,14 @@ static int __init init_default_values(void)
 
         for_each_possible_cpu (cpu) {
                 pr_debug("processing cpu %d\n", cpu);
-                sysdev = get_cpu_sysdev(cpu);
+                dev = get_cpu_device(cpu);
 
-                if (!sysdev) {
-                        pr_info("invalid sysdev pointer for cbe_thermal\n");
+                if (!dev) {
+                        pr_info("invalid dev pointer for cbe_thermal\n");
                         return -EINVAL;
                 }
 
-                pmd_regs = cbe_get_cpu_pmd_regs(sysdev->id);
+                pmd_regs = cbe_get_cpu_pmd_regs(dev->id);
 
                 if (!pmd_regs) {
                         pr_info("invalid CBE regs pointer for cbe_thermal\n");
@@ -379,8 +379,8 @@ static int __init thermal_init(void)
         int rc = init_default_values();
 
         if (rc == 0) {
-                spu_add_sysdev_attr_group(&spu_attribute_group);
-                cpu_add_sysdev_attr_group(&ppe_attribute_group);
+                spu_add_dev_attr_group(&spu_attribute_group);
+                cpu_add_dev_attr_group(&ppe_attribute_group);
         }
 
         return rc;
@@ -389,8 +389,8 @@ module_init(thermal_init);
 
 static void __exit thermal_exit(void)
 {
-        spu_remove_sysdev_attr_group(&spu_attribute_group);
-        cpu_remove_sysdev_attr_group(&ppe_attribute_group);
+        spu_remove_dev_attr_group(&spu_attribute_group);
+        cpu_remove_dev_attr_group(&ppe_attribute_group);
 }
 module_exit(thermal_exit);
 
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index f5c5c762d5a3..4a255cf8cd17 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -23,7 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/cache.h>
 #include <linux/err.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 
 #include <asm/ptrace.h>
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index e94d3ecdd8bb..8b1213993b10 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -519,31 +519,32 @@ void spu_init_channels(struct spu *spu)
 }
 EXPORT_SYMBOL_GPL(spu_init_channels);
 
-static struct sysdev_class spu_sysdev_class = {
+static struct bus_type spu_subsys = {
         .name = "spu",
+        .dev_name = "spu",
 };
 
-int spu_add_sysdev_attr(struct sysdev_attribute *attr)
+int spu_add_dev_attr(struct device_attribute *attr)
 {
         struct spu *spu;
 
         mutex_lock(&spu_full_list_mutex);
         list_for_each_entry(spu, &spu_full_list, full_list)
-                sysdev_create_file(&spu->sysdev, attr);
+                device_create_file(&spu->dev, attr);
         mutex_unlock(&spu_full_list_mutex);
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(spu_add_sysdev_attr);
+EXPORT_SYMBOL_GPL(spu_add_dev_attr);
 
-int spu_add_sysdev_attr_group(struct attribute_group *attrs)
+int spu_add_dev_attr_group(struct attribute_group *attrs)
 {
         struct spu *spu;
         int rc = 0;
 
         mutex_lock(&spu_full_list_mutex);
         list_for_each_entry(spu, &spu_full_list, full_list) {
-                rc = sysfs_create_group(&spu->sysdev.kobj, attrs);
+                rc = sysfs_create_group(&spu->dev.kobj, attrs);
 
                 /* we're in trouble here, but try unwinding anyway */
                 if (rc) {
@@ -552,7 +553,7 @@ int spu_add_sysdev_attr_group(struct attribute_group *attrs)
 
                         list_for_each_entry_continue_reverse(spu,
                                         &spu_full_list, full_list)
-                                sysfs_remove_group(&spu->sysdev.kobj, attrs);
+                                sysfs_remove_group(&spu->dev.kobj, attrs);
                         break;
                 }
         }
@@ -561,45 +562,45 @@ int spu_add_sysdev_attr_group(struct attribute_group *attrs)
 
         return rc;
 }
-EXPORT_SYMBOL_GPL(spu_add_sysdev_attr_group);
+EXPORT_SYMBOL_GPL(spu_add_dev_attr_group);
 
 
-void spu_remove_sysdev_attr(struct sysdev_attribute *attr)
+void spu_remove_dev_attr(struct device_attribute *attr)
 {
         struct spu *spu;
 
         mutex_lock(&spu_full_list_mutex);
         list_for_each_entry(spu, &spu_full_list, full_list)
-                sysdev_remove_file(&spu->sysdev, attr);
+                device_remove_file(&spu->dev, attr);
         mutex_unlock(&spu_full_list_mutex);
 }
-EXPORT_SYMBOL_GPL(spu_remove_sysdev_attr);
+EXPORT_SYMBOL_GPL(spu_remove_dev_attr);
 
-void spu_remove_sysdev_attr_group(struct attribute_group *attrs)
+void spu_remove_dev_attr_group(struct attribute_group *attrs)
 {
         struct spu *spu;
 
         mutex_lock(&spu_full_list_mutex);
         list_for_each_entry(spu, &spu_full_list, full_list)
-                sysfs_remove_group(&spu->sysdev.kobj, attrs);
+                sysfs_remove_group(&spu->dev.kobj, attrs);
         mutex_unlock(&spu_full_list_mutex);
 }
-EXPORT_SYMBOL_GPL(spu_remove_sysdev_attr_group);
+EXPORT_SYMBOL_GPL(spu_remove_dev_attr_group);
 
-static int spu_create_sysdev(struct spu *spu)
+static int spu_create_dev(struct spu *spu)
 {
         int ret;
 
-        spu->sysdev.id = spu->number;
-        spu->sysdev.cls = &spu_sysdev_class;
-        ret = sysdev_register(&spu->sysdev);
+        spu->dev.id = spu->number;
+        spu->dev.bus = &spu_subsys;
+        ret = device_register(&spu->dev);
         if (ret) {
                 printk(KERN_ERR "Can't register SPU %d with sysfs\n",
                                 spu->number);
                 return ret;
         }
 
-        sysfs_add_device_to_node(&spu->sysdev, spu->node);
+        sysfs_add_device_to_node(&spu->dev, spu->node);
 
         return 0;
 }
@@ -635,7 +636,7 @@ static int __init create_spu(void *data)
         if (ret)
                 goto out_destroy;
 
-        ret = spu_create_sysdev(spu);
+        ret = spu_create_dev(spu);
         if (ret)
                 goto out_free_irqs;
 
@@ -692,10 +693,10 @@ static unsigned long long spu_acct_time(struct spu *spu,
 }
 
 
-static ssize_t spu_stat_show(struct sys_device *sysdev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t spu_stat_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
-        struct spu *spu = container_of(sysdev, struct spu, sysdev);
+        struct spu *spu = container_of(dev, struct spu, dev);
 
         return sprintf(buf, "%s %llu %llu %llu %llu "
                       "%llu %llu %llu %llu %llu %llu %llu %llu\n",
@@ -714,7 +715,7 @@ static ssize_t spu_stat_show(struct sys_device *sysdev,
                 spu->stats.libassist);
 }
 
-static SYSDEV_ATTR(stat, 0644, spu_stat_show, NULL);
+static DEVICE_ATTR(stat, 0644, spu_stat_show, NULL);
 
 #ifdef CONFIG_KEXEC
 
@@ -813,8 +814,8 @@ static int __init init_spu_base(void)
         if (!spu_management_ops)
                 goto out;
 
-        /* create sysdev class for spus */
-        ret = sysdev_class_register(&spu_sysdev_class);
+        /* create system subsystem for spus */
+        ret = subsys_system_register(&spu_subsys, NULL);
         if (ret)
                 goto out;
 
@@ -823,7 +824,7 @@ static int __init init_spu_base(void)
         if (ret < 0) {
                 printk(KERN_WARNING "%s: Error initializing spus\n",
                         __func__);
-                goto out_unregister_sysdev_class;
+                goto out_unregister_subsys;
         }
 
         if (ret > 0)
@@ -833,15 +834,15 @@ static int __init init_spu_base(void)
         xmon_register_spus(&spu_full_list);
         crash_register_spus(&spu_full_list);
         mutex_unlock(&spu_full_list_mutex);
-        spu_add_sysdev_attr(&attr_stat);
+        spu_add_dev_attr(&dev_attr_stat);
         register_syscore_ops(&spu_syscore_ops);
 
         spu_init_affinity();
 
         return 0;
 
- out_unregister_sysdev_class:
-        sysdev_class_unregister(&spu_sysdev_class);
+ out_unregister_subsys:
+        bus_unregister(&spu_subsys);
  out:
         return ret;
 }
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c
index 7e2a5515ed76..02df49fb59f0 100644
--- a/arch/powerpc/platforms/iseries/smp.c
+++ b/arch/powerpc/platforms/iseries/smp.c
@@ -24,7 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/cache.h>
 #include <linux/err.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 
 #include <asm/ptrace.h>
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 04af5f48b4eb..1fc386a23f18 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -23,7 +23,7 @@
 #include <linux/pmu.h>
 #include <linux/cpufreq.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/hardirq.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index 3cafc306b971..c638535753df 100644
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -33,7 +33,7 @@
 #include <linux/sched.h>
 #include <linux/stringify.h>
 #include <linux/swap.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <asm/firmware.h>
 #include <asm/hvcall.h>
 #include <asm/mmu.h>
@@ -65,7 +65,7 @@ static unsigned int oom_kb = CMM_OOM_KB;
 static unsigned int cmm_debug = CMM_DEBUG;
 static unsigned int cmm_disabled = CMM_DISABLE;
 static unsigned long min_mem_mb = CMM_MIN_MEM_MB;
-static struct sys_device cmm_sysdev;
+static struct device cmm_dev;
 
 MODULE_AUTHOR("Brian King <brking@linux.vnet.ibm.com>");
 MODULE_DESCRIPTION("IBM System p Collaborative Memory Manager");
@@ -347,25 +347,25 @@ static int cmm_thread(void *dummy)
 }
 
 #define CMM_SHOW(name, format, args...)                 \
-        static ssize_t show_##name(struct sys_device *dev,      \
-                                   struct sysdev_attribute *attr,       \
+        static ssize_t show_##name(struct device *dev,  \
+                                   struct device_attribute *attr,       \
                                    char *buf)                   \
         {                                                       \
                 return sprintf(buf, format, ##args);            \
         }                                                       \
-        static SYSDEV_ATTR(name, S_IRUGO, show_##name, NULL)
+        static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
 
 CMM_SHOW(loaned_kb, "%lu\n", PAGES2KB(loaned_pages));
 CMM_SHOW(loaned_target_kb, "%lu\n", PAGES2KB(loaned_pages_target));
 
-static ssize_t show_oom_pages(struct sys_device *dev,
-                              struct sysdev_attribute *attr, char *buf)
+static ssize_t show_oom_pages(struct device *dev,
+                              struct device_attribute *attr, char *buf)
 {
         return sprintf(buf, "%lu\n", PAGES2KB(oom_freed_pages));
 }
 
-static ssize_t store_oom_pages(struct sys_device *dev,
-                               struct sysdev_attribute *attr,
+static ssize_t store_oom_pages(struct device *dev,
+                               struct device_attribute *attr,
                                const char *buf, size_t count)
 {
         unsigned long val = simple_strtoul (buf, NULL, 10);
@@ -379,17 +379,18 @@ static ssize_t store_oom_pages(struct sys_device *dev,
         return count;
 }
 
-static SYSDEV_ATTR(oom_freed_kb, S_IWUSR| S_IRUGO,
+static DEVICE_ATTR(oom_freed_kb, S_IWUSR | S_IRUGO,
                    show_oom_pages, store_oom_pages);
 
-static struct sysdev_attribute *cmm_attrs[] = {
-        &attr_loaned_kb,
-        &attr_loaned_target_kb,
-        &attr_oom_freed_kb,
+static struct device_attribute *cmm_attrs[] = {
+        &dev_attr_loaned_kb,
+        &dev_attr_loaned_target_kb,
+        &dev_attr_oom_freed_kb,
 };
 
-static struct sysdev_class cmm_sysdev_class = {
+static struct bus_type cmm_subsys = {
         .name = "cmm",
+        .dev_name = "cmm",
 };
 
 /**
@@ -398,21 +399,21 @@ static struct sysdev_class cmm_sysdev_class = {
  * Return value:
  *      0 on success / other on failure
  **/
-static int cmm_sysfs_register(struct sys_device *sysdev)
+static int cmm_sysfs_register(struct device *dev)
 {
         int i, rc;
 
-        if ((rc = sysdev_class_register(&cmm_sysdev_class)))
+        if ((rc = subsys_system_register(&cmm_subsys, NULL)))
                 return rc;
 
-        sysdev->id = 0;
-        sysdev->cls = &cmm_sysdev_class;
+        dev->id = 0;
+        dev->bus = &cmm_subsys;
 
-        if ((rc = sysdev_register(sysdev)))
-                goto class_unregister;
+        if ((rc = device_register(dev)))
+                goto subsys_unregister;
 
         for (i = 0; i < ARRAY_SIZE(cmm_attrs); i++) {
-                if ((rc = sysdev_create_file(sysdev, cmm_attrs[i])))
+                if ((rc = device_create_file(dev, cmm_attrs[i])))
                         goto fail;
         }
 
@@ -420,10 +421,10 @@ static int cmm_sysfs_register(struct sys_device *sysdev)
 
 fail:
         while (--i >= 0)
-                sysdev_remove_file(sysdev, cmm_attrs[i]);
-        sysdev_unregister(sysdev);
-class_unregister:
-        sysdev_class_unregister(&cmm_sysdev_class);
+                device_remove_file(dev, cmm_attrs[i]);
+        device_unregister(dev);
+subsys_unregister:
+        bus_unregister(&cmm_subsys);
         return rc;
 }
 
@@ -431,14 +432,14 @@ class_unregister:
  * cmm_unregister_sysfs - Unregister from sysfs
  *
  **/
-static void cmm_unregister_sysfs(struct sys_device *sysdev)
+static void cmm_unregister_sysfs(struct device *dev)
 {
         int i;
 
         for (i = 0; i < ARRAY_SIZE(cmm_attrs); i++)
-                sysdev_remove_file(sysdev, cmm_attrs[i]);
-        sysdev_unregister(sysdev);
-        sysdev_class_unregister(&cmm_sysdev_class);
+                device_remove_file(dev, cmm_attrs[i]);
+        device_unregister(dev);
+        bus_unregister(&cmm_subsys);
 }
 
 /**
@@ -657,7 +658,7 @@ static int cmm_init(void)
         if ((rc = register_reboot_notifier(&cmm_reboot_nb)))
                 goto out_oom_notifier;
 
-        if ((rc = cmm_sysfs_register(&cmm_sysdev)))
+        if ((rc = cmm_sysfs_register(&cmm_dev)))
                 goto out_reboot_notifier;
 
         if (register_memory_notifier(&cmm_mem_nb) ||
@@ -678,7 +679,7 @@ static int cmm_init(void)
 out_unregister_notifier:
         unregister_memory_notifier(&cmm_mem_nb);
         unregister_memory_isolate_notifier(&cmm_mem_isolate_nb);
-        cmm_unregister_sysfs(&cmm_sysdev);
+        cmm_unregister_sysfs(&cmm_dev);
 out_reboot_notifier:
         unregister_reboot_notifier(&cmm_reboot_nb);
 out_oom_notifier:
@@ -701,7 +702,7 @@ static void cmm_exit(void)
         unregister_memory_notifier(&cmm_mem_nb);
         unregister_memory_isolate_notifier(&cmm_mem_isolate_nb);
         cmm_free_pages(loaned_pages);
-        cmm_unregister_sysfs(&cmm_sysdev);
+        cmm_unregister_sysfs(&cmm_dev);
 }
 
 /**
diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c
index c8b3c69fe891..af281dce510a 100644
--- a/arch/powerpc/platforms/pseries/pseries_energy.c
+++ b/arch/powerpc/platforms/pseries/pseries_energy.c
@@ -15,7 +15,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/seq_file.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/of.h>
 #include <asm/cputhreads.h>
@@ -184,7 +184,7 @@ static ssize_t get_best_energy_list(char *page, int activate)
         return s-page;
 }
 
-static ssize_t get_best_energy_data(struct sys_device *dev,
+static ssize_t get_best_energy_data(struct device *dev,
                                         char *page, int activate)
 {
         int rc;
@@ -207,26 +207,26 @@ static ssize_t get_best_energy_data(struct sys_device *dev,
 
 /* Wrapper functions */
 
-static ssize_t cpu_activate_hint_list_show(struct sysdev_class *class,
-                        struct sysdev_class_attribute *attr, char *page)
+static ssize_t cpu_activate_hint_list_show(struct device *dev,
+                        struct device_attribute *attr, char *page)
 {
         return get_best_energy_list(page, 1);
 }
 
-static ssize_t cpu_deactivate_hint_list_show(struct sysdev_class *class,
-                        struct sysdev_class_attribute *attr, char *page)
+static ssize_t cpu_deactivate_hint_list_show(struct device *dev,
+                        struct device_attribute *attr, char *page)
 {
         return get_best_energy_list(page, 0);
 }
 
-static ssize_t percpu_activate_hint_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *page)
+static ssize_t percpu_activate_hint_show(struct device *dev,
+                        struct device_attribute *attr, char *page)
 {
         return get_best_energy_data(dev, page, 1);
 }
 
-static ssize_t percpu_deactivate_hint_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *page)
+static ssize_t percpu_deactivate_hint_show(struct device *dev,
+                        struct device_attribute *attr, char *page)
 {
         return get_best_energy_data(dev, page, 0);
 }
@@ -241,48 +241,48 @@ static ssize_t percpu_deactivate_hint_show(struct sys_device *dev,
  *      Per-cpu value of the hint
  */
 
-struct sysdev_class_attribute attr_cpu_activate_hint_list =
-                _SYSDEV_CLASS_ATTR(pseries_activate_hint_list, 0444,
+struct device_attribute attr_cpu_activate_hint_list =
+                __ATTR(pseries_activate_hint_list, 0444,
                 cpu_activate_hint_list_show, NULL);
 
-struct sysdev_class_attribute attr_cpu_deactivate_hint_list =
-                _SYSDEV_CLASS_ATTR(pseries_deactivate_hint_list, 0444,
+struct device_attribute attr_cpu_deactivate_hint_list =
+                __ATTR(pseries_deactivate_hint_list, 0444,
                 cpu_deactivate_hint_list_show, NULL);
 
-struct sysdev_attribute attr_percpu_activate_hint =
-                _SYSDEV_ATTR(pseries_activate_hint, 0444,
+struct device_attribute attr_percpu_activate_hint =
+                __ATTR(pseries_activate_hint, 0444,
                 percpu_activate_hint_show, NULL);
 
-struct sysdev_attribute attr_percpu_deactivate_hint =
-                _SYSDEV_ATTR(pseries_deactivate_hint, 0444,
+struct device_attribute attr_percpu_deactivate_hint =
+                __ATTR(pseries_deactivate_hint, 0444,
                 percpu_deactivate_hint_show, NULL);
 
 static int __init pseries_energy_init(void)
 {
         int cpu, err;
-        struct sys_device *cpu_sys_dev;
+        struct device *cpu_dev;
 
         if (!check_for_h_best_energy()) {
                 printk(KERN_INFO "Hypercall H_BEST_ENERGY not supported\n");
                 return 0;
         }
         /* Create the sysfs files */
-        err = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
-                                &attr_cpu_activate_hint_list.attr);
+        err = device_create_file(cpu_subsys.dev_root,
+                                &attr_cpu_activate_hint_list);
         if (!err)
-                err = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
-                                &attr_cpu_deactivate_hint_list.attr);
+                err = device_create_file(cpu_subsys.dev_root,
+                                &attr_cpu_deactivate_hint_list);
 
         if (err)
                 return err;
         for_each_possible_cpu(cpu) {
-                cpu_sys_dev = get_cpu_sysdev(cpu);
-                err = sysfs_create_file(&cpu_sys_dev->kobj,
-                                &attr_percpu_activate_hint.attr);
+                cpu_dev = get_cpu_device(cpu);
+                err = device_create_file(cpu_dev,
+                                &attr_percpu_activate_hint);
                 if (err)
                         break;
-                err = sysfs_create_file(&cpu_sys_dev->kobj,
-                                &attr_percpu_deactivate_hint.attr);
+                err = device_create_file(cpu_dev,
+                                &attr_percpu_deactivate_hint);
                 if (err)
                         break;
         }
@@ -298,23 +298,20 @@ static int __init pseries_energy_init(void)
 static void __exit pseries_energy_cleanup(void)
 {
         int cpu;
-        struct sys_device *cpu_sys_dev;
+        struct device *cpu_dev;
 
         if (!sysfs_entries)
                 return;
 
         /* Remove the sysfs files */
-        sysfs_remove_file(&cpu_sysdev_class.kset.kobj,
-                                &attr_cpu_activate_hint_list.attr);
-
-        sysfs_remove_file(&cpu_sysdev_class.kset.kobj,
-                                &attr_cpu_deactivate_hint_list.attr);
+        device_remove_file(cpu_subsys.dev_root, &attr_cpu_activate_hint_list);
+        device_remove_file(cpu_subsys.dev_root, &attr_cpu_deactivate_hint_list);
 
         for_each_possible_cpu(cpu) {
-                cpu_sys_dev = get_cpu_sysdev(cpu);
-                sysfs_remove_file(&cpu_sys_dev->kobj,
+                cpu_dev = get_cpu_device(cpu);
+                sysfs_remove_file(&cpu_dev->kobj,
                                 &attr_percpu_activate_hint.attr);
-                sysfs_remove_file(&cpu_sys_dev->kobj,
+                sysfs_remove_file(&cpu_dev->kobj,
                                 &attr_percpu_deactivate_hint.attr);
         }
 }
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 26e93fd4c62b..6212ff4693ea 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -22,7 +22,7 @@
 #include <linux/spinlock.h>
 #include <linux/cache.h>
 #include <linux/err.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 
 #include <asm/ptrace.h>
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index d3de0849f296..b84a8b2238dd 100644
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -26,7 +26,7 @@
 #include <asm/rtas.h>
 
 static u64 stream_id;
-static struct sys_device suspend_sysdev;
+static struct device suspend_dev;
 static DECLARE_COMPLETION(suspend_work);
 static struct rtas_suspend_me_data suspend_data;
 static atomic_t suspending;
@@ -110,8 +110,8 @@ static int pseries_prepare_late(void)
 
 /**
  * store_hibernate - Initiate partition hibernation
- * @classdev:   sysdev class struct
- * @attr:               class device attribute struct
+ * @dev:                subsys root device
+ * @attr:               device attribute struct
  * @buf:                buffer
  * @count:              buffer size
  *
@@ -121,8 +121,8 @@ static int pseries_prepare_late(void)
  * Return value:
  *      number of bytes printed to buffer / other on failure
  **/
-static ssize_t store_hibernate(struct sysdev_class *classdev,
-                               struct sysdev_class_attribute *attr,
+static ssize_t store_hibernate(struct device *dev,
+                               struct device_attribute *attr,
                                const char *buf, size_t count)
 {
         int rc;
@@ -148,10 +148,11 @@ static ssize_t store_hibernate(struct sysdev_class *classdev,
         return rc;
 }
 
-static SYSDEV_CLASS_ATTR(hibernate, S_IWUSR, NULL, store_hibernate);
+static DEVICE_ATTR(hibernate, S_IWUSR, NULL, store_hibernate);
 
-static struct sysdev_class suspend_sysdev_class = {
+static struct bus_type suspend_subsys = {
         .name = "power",
+        .dev_name = "power",
 };
 
 static const struct platform_suspend_ops pseries_suspend_ops = {
@@ -167,23 +168,23 @@ static const struct platform_suspend_ops pseries_suspend_ops = {
  * Return value:
  *      0 on success / other on failure
  **/
-static int pseries_suspend_sysfs_register(struct sys_device *sysdev)
+static int pseries_suspend_sysfs_register(struct device *dev)
 {
         int rc;
 
-        if ((rc = sysdev_class_register(&suspend_sysdev_class)))
+        if ((rc = subsys_system_register(&suspend_subsys, NULL)))
                 return rc;
 
-        sysdev->id = 0;
-        sysdev->cls = &suspend_sysdev_class;
+        dev->id = 0;
+        dev->bus = &suspend_subsys;
 
-        if ((rc = sysdev_class_create_file(&suspend_sysdev_class, &attr_hibernate)))
-                goto class_unregister;
+        if ((rc = device_create_file(suspend_subsys.dev_root, &dev_attr_hibernate)))
+                goto subsys_unregister;
 
         return 0;
 
-class_unregister:
-        sysdev_class_unregister(&suspend_sysdev_class);
+subsys_unregister:
+        bus_unregister(&suspend_subsys);
         return rc;
 }
 
@@ -204,7 +205,7 @@ static int __init pseries_suspend_init(void)
         if (suspend_data.token == RTAS_UNKNOWN_SERVICE)
                 return 0;
 
-        if ((rc = pseries_suspend_sysfs_register(&suspend_sysdev)))
+        if ((rc = pseries_suspend_sysfs_register(&suspend_dev)))
                 return rc;
 
         ppc_md.suspend_disable_cpu = pseries_suspend_cpu;
diff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c
index 73b86cc5ea74..82e2cfe35c62 100644
--- a/arch/powerpc/sysdev/ppc4xx_cpm.c
+++ b/arch/powerpc/sysdev/ppc4xx_cpm.c
@@ -179,12 +179,12 @@ static struct kobj_attribute cpm_idle_attr =
 
 static void cpm_idle_config_sysfs(void)
 {
-        struct sys_device *sys_dev;
+        struct device *dev;
         unsigned long ret;
 
-        sys_dev = get_cpu_sysdev(0);
+        dev = get_cpu_device(0);
 
-        ret = sysfs_create_file(&sys_dev->kobj,
+        ret = sysfs_create_file(&dev->kobj,
                                 &cpm_idle_attr.attr);
         if (ret)
                 printk(KERN_WARNING
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 18e75ca19fe6..73034bd203c4 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -22,7 +22,6 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/sysdev.h>
 #include <linux/device.h>
 #include <linux/bootmem.h>
 #include <linux/spinlock.h>
@@ -484,13 +483,14 @@ int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high)
         return 0;
 }
 
-static struct sysdev_class qe_ic_sysclass = {
+static struct bus_type qe_ic_subsys = {
         .name = "qe_ic",
+        .dev_name = "qe_ic",
 };
 
-static struct sys_device device_qe_ic = {
+static struct device device_qe_ic = {
         .id = 0,
-        .cls = &qe_ic_sysclass,
+        .bus = &qe_ic_subsys,
 };
 
 static int __init init_qe_ic_sysfs(void)
@@ -499,12 +499,12 @@ static int __init init_qe_ic_sysfs(void)
 
         printk(KERN_DEBUG "Registering qe_ic with sysfs...\n");
 
-        rc = sysdev_class_register(&qe_ic_sysclass);
+        rc = subsys_system_register(&qe_ic_subsys, NULL);
         if (rc) {
                 printk(KERN_ERR "Failed registering qe_ic sys class\n");
                 return -ENODEV;
         }
-        rc = sysdev_register(&device_qe_ic);
+        rc = device_register(&device_qe_ic);
         if (rc) {
                 printk(KERN_ERR "Failed registering qe_ic sys device\n");
                 return -ENODEV;
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 3330feca7502..063c901b1265 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -18,7 +18,6 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/sysdev.h>
 #include <linux/device.h>
 #include <linux/bootmem.h>
 #include <linux/spinlock.h>
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 3ea872890da2..66cca03c0282 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -831,8 +831,8 @@ int setup_profiling_timer(unsigned int multiplier)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static ssize_t cpu_configure_show(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t cpu_configure_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         ssize_t count;
 
@@ -842,8 +842,8 @@ static ssize_t cpu_configure_show(struct sys_device *dev,
         return count;
 }
 
-static ssize_t cpu_configure_store(struct sys_device *dev,
-                                  struct sysdev_attribute *attr,
+static ssize_t cpu_configure_store(struct device *dev,
+                                  struct device_attribute *attr,
                                   const char *buf, size_t count)
 {
         int cpu = dev->id;
@@ -889,11 +889,11 @@ out:
         put_online_cpus();
         return rc ? rc : count;
 }
-static SYSDEV_ATTR(configure, 0644, cpu_configure_show, cpu_configure_store);
+static DEVICE_ATTR(configure, 0644, cpu_configure_show, cpu_configure_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t cpu_polarization_show(struct sys_device *dev,
-                                     struct sysdev_attribute *attr, char *buf)
+static ssize_t cpu_polarization_show(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
 {
         int cpu = dev->id;
         ssize_t count;
@@ -919,22 +919,22 @@ static ssize_t cpu_polarization_show(struct sys_device *dev,
         mutex_unlock(&smp_cpu_state_mutex);
         return count;
 }
-static SYSDEV_ATTR(polarization, 0444, cpu_polarization_show, NULL);
+static DEVICE_ATTR(polarization, 0444, cpu_polarization_show, NULL);
 
-static ssize_t show_cpu_address(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_cpu_address(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         return sprintf(buf, "%d\n", __cpu_logical_map[dev->id]);
 }
-static SYSDEV_ATTR(address, 0444, show_cpu_address, NULL);
+static DEVICE_ATTR(address, 0444, show_cpu_address, NULL);
 
 
 static struct attribute *cpu_common_attrs[] = {
 #ifdef CONFIG_HOTPLUG_CPU
-        &attr_configure.attr,
+        &dev_attr_configure.attr,
 #endif
-        &attr_address.attr,
-        &attr_polarization.attr,
+        &dev_attr_address.attr,
+        &dev_attr_polarization.attr,
         NULL,
 };
 
@@ -942,8 +942,8 @@ static struct attribute_group cpu_common_attr_group = {
         .attrs = cpu_common_attrs,
 };
 
-static ssize_t show_capability(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_capability(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned int capability;
         int rc;
@@ -953,10 +953,10 @@ static ssize_t show_capability(struct sys_device *dev,
                 return rc;
         return sprintf(buf, "%u\n", capability);
 }
-static SYSDEV_ATTR(capability, 0444, show_capability, NULL);
+static DEVICE_ATTR(capability, 0444, show_capability, NULL);
 
-static ssize_t show_idle_count(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_idle_count(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct s390_idle_data *idle;
         unsigned long long idle_count;
@@ -976,10 +976,10 @@ repeat:
                 goto repeat;
         return sprintf(buf, "%llu\n", idle_count);
 }
-static SYSDEV_ATTR(idle_count, 0444, show_idle_count, NULL);
+static DEVICE_ATTR(idle_count, 0444, show_idle_count, NULL);
 
-static ssize_t show_idle_time(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_idle_time(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct s390_idle_data *idle;
         unsigned long long now, idle_time, idle_enter;
@@ -1001,12 +1001,12 @@ repeat:
                 goto repeat;
         return sprintf(buf, "%llu\n", idle_time >> 12);
 }
-static SYSDEV_ATTR(idle_time_us, 0444, show_idle_time, NULL);
+static DEVICE_ATTR(idle_time_us, 0444, show_idle_time, NULL);
 
 static struct attribute *cpu_online_attrs[] = {
-        &attr_capability.attr,
-        &attr_idle_count.attr,
-        &attr_idle_time_us.attr,
+        &dev_attr_capability.attr,
+        &dev_attr_idle_count.attr,
+        &dev_attr_idle_time_us.attr,
         NULL,
 };
 
@@ -1019,7 +1019,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
 {
         unsigned int cpu = (unsigned int)(long)hcpu;
         struct cpu *c = &per_cpu(cpu_devices, cpu);
-        struct sys_device *s = &c->sysdev;
+        struct device *s = &c->dev;
         struct s390_idle_data *idle;
         int err = 0;
 
@@ -1045,7 +1045,7 @@ static struct notifier_block __cpuinitdata smp_cpu_nb = {
 static int __devinit smp_add_present_cpu(int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
-        struct sys_device *s = &c->sysdev;
+        struct device *s = &c->dev;
         int rc;
 
         c->hotpluggable = 1;
@@ -1098,8 +1098,8 @@ out:
         return rc;
 }
 
-static ssize_t __ref rescan_store(struct sysdev_class *class,
-                                  struct sysdev_class_attribute *attr,
+static ssize_t __ref rescan_store(struct device *dev,
+                                  struct device_attribute *attr,
                                   const char *buf,
                                   size_t count)
 {
@@ -1108,11 +1108,11 @@ static ssize_t __ref rescan_store(struct sysdev_class *class,
         rc = smp_rescan_cpus();
         return rc ? rc : count;
 }
-static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store);
+static DEVICE_ATTR(rescan, 0200, NULL, rescan_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t dispatching_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t dispatching_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         ssize_t count;
@@ -1123,8 +1123,8 @@ static ssize_t dispatching_show(struct sysdev_class *class,
         return count;
 }
 
-static ssize_t dispatching_store(struct sysdev_class *dev,
-                                 struct sysdev_class_attribute *attr,
+static ssize_t dispatching_store(struct device *dev,
+                                 struct device_attribute *attr,
                                  const char *buf,
                                  size_t count)
 {
@@ -1148,7 +1148,7 @@ out:
         put_online_cpus();
         return rc ? rc : count;
 }
-static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show,
+static DEVICE_ATTR(dispatching, 0644, dispatching_show,
                          dispatching_store);
 
 static int __init topology_init(void)
@@ -1159,11 +1159,11 @@ static int __init topology_init(void)
         register_cpu_notifier(&smp_cpu_nb);
 
 #ifdef CONFIG_HOTPLUG_CPU
-        rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_rescan);
+        rc = device_create_file(cpu_subsys.dev_root, &dev_attr_rescan);
         if (rc)
                 return rc;
 #endif
-        rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_dispatching);
+        rc = device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);
         if (rc)
                 return rc;
         for_each_present_cpu(cpu) {
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index ebbfab3c6e5a..fa02f443f5f6 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -27,7 +27,7 @@
 #include <linux/cpu.h>
 #include <linux/stop_machine.h>
 #include <linux/time.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/smp.h>
@@ -1116,34 +1116,35 @@ out_unlock:
 /*
  * Sysfs interface functions
  */
-static struct sysdev_class etr_sysclass = {
-        .name   = "etr",
+static struct bus_type etr_subsys = {
+        .name           = "etr",
+        .dev_name       = "etr",
 };
 
-static struct sys_device etr_port0_dev = {
+static struct device etr_port0_dev = {
         .id     = 0,
-        .cls    = &etr_sysclass,
+        .bus    = &etr_subsys,
 };
 
-static struct sys_device etr_port1_dev = {
+static struct device etr_port1_dev = {
         .id     = 1,
-        .cls    = &etr_sysclass,
+        .bus    = &etr_subsys,
 };
 
 /*
- * ETR class attributes
+ * ETR subsys attributes
  */
-static ssize_t etr_stepping_port_show(struct sysdev_class *class,
-                                        struct sysdev_class_attribute *attr,
+static ssize_t etr_stepping_port_show(struct device *dev,
+                                        struct device_attribute *attr,
                                         char *buf)
 {
         return sprintf(buf, "%i\n", etr_port0.esw.p);
 }
 
-static SYSDEV_CLASS_ATTR(stepping_port, 0400, etr_stepping_port_show, NULL);
+static DEVICE_ATTR(stepping_port, 0400, etr_stepping_port_show, NULL);
 
-static ssize_t etr_stepping_mode_show(struct sysdev_class *class,
-                                        struct sysdev_class_attribute *attr,
+static ssize_t etr_stepping_mode_show(struct device *dev,
+                                        struct device_attribute *attr,
                                         char *buf)
 {
         char *mode_str;
@@ -1157,12 +1158,12 @@ static ssize_t etr_stepping_mode_show(struct sysdev_class *class,
         return sprintf(buf, "%s\n", mode_str);
 }
 
-static SYSDEV_CLASS_ATTR(stepping_mode, 0400, etr_stepping_mode_show, NULL);
+static DEVICE_ATTR(stepping_mode, 0400, etr_stepping_mode_show, NULL);
 
 /*
  * ETR port attributes
  */
-static inline struct etr_aib *etr_aib_from_dev(struct sys_device *dev)
+static inline struct etr_aib *etr_aib_from_dev(struct device *dev)
 {
         if (dev == &etr_port0_dev)
                 return etr_port0_online ? &etr_port0 : NULL;
@@ -1170,8 +1171,8 @@ static inline struct etr_aib *etr_aib_from_dev(struct sys_device *dev)
                 return etr_port1_online ? &etr_port1 : NULL;
 }
 
-static ssize_t etr_online_show(struct sys_device *dev,
-                                struct sysdev_attribute *attr,
+static ssize_t etr_online_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         unsigned int online;
@@ -1180,8 +1181,8 @@ static ssize_t etr_online_show(struct sys_device *dev,
         return sprintf(buf, "%i\n", online);
 }
 
-static ssize_t etr_online_store(struct sys_device *dev,
-                                struct sysdev_attribute *attr,
+static ssize_t etr_online_store(struct device *dev,
+                                struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
         unsigned int value;
@@ -1218,20 +1219,20 @@ out:
         return count;
 }
 
-static SYSDEV_ATTR(online, 0600, etr_online_show, etr_online_store);
+static DEVICE_ATTR(online, 0600, etr_online_show, etr_online_store);
 
-static ssize_t etr_stepping_control_show(struct sys_device *dev,
-                                        struct sysdev_attribute *attr,
+static ssize_t etr_stepping_control_show(struct device *dev,
+                                        struct device_attribute *attr,
                                         char *buf)
 {
         return sprintf(buf, "%i\n", (dev == &etr_port0_dev) ?
                        etr_eacr.e0 : etr_eacr.e1);
 }
 
-static SYSDEV_ATTR(stepping_control, 0400, etr_stepping_control_show, NULL);
+static DEVICE_ATTR(stepping_control, 0400, etr_stepping_control_show, NULL);
 
-static ssize_t etr_mode_code_show(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t etr_mode_code_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         if (!etr_port0_online && !etr_port1_online)
                 /* Status word is not uptodate if both ports are offline. */
@@ -1240,10 +1241,10 @@ static ssize_t etr_mode_code_show(struct sys_device *dev,
                        etr_port0.esw.psc0 : etr_port0.esw.psc1);
 }
 
-static SYSDEV_ATTR(state_code, 0400, etr_mode_code_show, NULL);
+static DEVICE_ATTR(state_code, 0400, etr_mode_code_show, NULL);
 
-static ssize_t etr_untuned_show(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t etr_untuned_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct etr_aib *aib = etr_aib_from_dev(dev);
 
@@ -1252,10 +1253,10 @@ static ssize_t etr_untuned_show(struct sys_device *dev,
         return sprintf(buf, "%i\n", aib->edf1.u);
 }
 
-static SYSDEV_ATTR(untuned, 0400, etr_untuned_show, NULL);
+static DEVICE_ATTR(untuned, 0400, etr_untuned_show, NULL);
 
-static ssize_t etr_network_id_show(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t etr_network_id_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct etr_aib *aib = etr_aib_from_dev(dev);
 
@@ -1264,10 +1265,10 @@ static ssize_t etr_network_id_show(struct sys_device *dev,
         return sprintf(buf, "%i\n", aib->edf1.net_id);
 }
 
-static SYSDEV_ATTR(network, 0400, etr_network_id_show, NULL);
+static DEVICE_ATTR(network, 0400, etr_network_id_show, NULL);
 
-static ssize_t etr_id_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t etr_id_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         struct etr_aib *aib = etr_aib_from_dev(dev);
 
@@ -1276,10 +1277,10 @@ static ssize_t etr_id_show(struct sys_device *dev,
         return sprintf(buf, "%i\n", aib->edf1.etr_id);
 }
 
-static SYSDEV_ATTR(id, 0400, etr_id_show, NULL);
+static DEVICE_ATTR(id, 0400, etr_id_show, NULL);
 
-static ssize_t etr_port_number_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t etr_port_number_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         struct etr_aib *aib = etr_aib_from_dev(dev);
 
@@ -1288,10 +1289,10 @@ static ssize_t etr_port_number_show(struct sys_device *dev,
         return sprintf(buf, "%i\n", aib->edf1.etr_pn);
 }
 
-static SYSDEV_ATTR(port, 0400, etr_port_number_show, NULL);
+static DEVICE_ATTR(port, 0400, etr_port_number_show, NULL);
 
-static ssize_t etr_coupled_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t etr_coupled_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         struct etr_aib *aib = etr_aib_from_dev(dev);
 
@@ -1300,10 +1301,10 @@ static ssize_t etr_coupled_show(struct sys_device *dev,
         return sprintf(buf, "%i\n", aib->edf3.c);
 }
 
-static SYSDEV_ATTR(coupled, 0400, etr_coupled_show, NULL);
+static DEVICE_ATTR(coupled, 0400, etr_coupled_show, NULL);
 
-static ssize_t etr_local_time_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t etr_local_time_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         struct etr_aib *aib = etr_aib_from_dev(dev);
 
@@ -1312,10 +1313,10 @@ static ssize_t etr_local_time_show(struct sys_device *dev,
         return sprintf(buf, "%i\n", aib->edf3.blto);
 }
 
-static SYSDEV_ATTR(local_time, 0400, etr_local_time_show, NULL);
+static DEVICE_ATTR(local_time, 0400, etr_local_time_show, NULL);
 
-static ssize_t etr_utc_offset_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t etr_utc_offset_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         struct etr_aib *aib = etr_aib_from_dev(dev);
 
@@ -1324,64 +1325,64 @@ static ssize_t etr_utc_offset_show(struct sys_device *dev,
         return sprintf(buf, "%i\n", aib->edf3.buo);
 }
 
-static SYSDEV_ATTR(utc_offset, 0400, etr_utc_offset_show, NULL);
+static DEVICE_ATTR(utc_offset, 0400, etr_utc_offset_show, NULL);
 
-static struct sysdev_attribute *etr_port_attributes[] = {
-        &attr_online,
-        &attr_stepping_control,
-        &attr_state_code,
-        &attr_untuned,
-        &attr_network,
-        &attr_id,
-        &attr_port,
-        &attr_coupled,
-        &attr_local_time,
-        &attr_utc_offset,
+static struct device_attribute *etr_port_attributes[] = {
+        &dev_attr_online,
+        &dev_attr_stepping_control,
+        &dev_attr_state_code,
+        &dev_attr_untuned,
+        &dev_attr_network,
+        &dev_attr_id,
+        &dev_attr_port,
+        &dev_attr_coupled,
+        &dev_attr_local_time,
+        &dev_attr_utc_offset,
         NULL
 };
 
-static int __init etr_register_port(struct sys_device *dev)
+static int __init etr_register_port(struct device *dev)
 {
-        struct sysdev_attribute **attr;
+        struct device_attribute **attr;
         int rc;
 
-        rc = sysdev_register(dev);
+        rc = device_register(dev);
         if (rc)
                 goto out;
         for (attr = etr_port_attributes; *attr; attr++) {
-                rc = sysdev_create_file(dev, *attr);
+                rc = device_create_file(dev, *attr);
                 if (rc)
                         goto out_unreg;
         }
         return 0;
 out_unreg:
         for (; attr >= etr_port_attributes; attr--)
-                sysdev_remove_file(dev, *attr);
-        sysdev_unregister(dev);
+                device_remove_file(dev, *attr);
+        device_unregister(dev);
 out:
         return rc;
 }
 
-static void __init etr_unregister_port(struct sys_device *dev)
+static void __init etr_unregister_port(struct device *dev)
 {
-        struct sysdev_attribute **attr;
+        struct device_attribute **attr;
 
         for (attr = etr_port_attributes; *attr; attr++)
-                sysdev_remove_file(dev, *attr);
-        sysdev_unregister(dev);
+                device_remove_file(dev, *attr);
+        device_unregister(dev);
 }
 
 static int __init etr_init_sysfs(void)
 {
         int rc;
 
-        rc = sysdev_class_register(&etr_sysclass);
+        rc = subsys_system_register(&etr_subsys, NULL);
         if (rc)
                 goto out;
-        rc = sysdev_class_create_file(&etr_sysclass, &attr_stepping_port);
+        rc = device_create_file(etr_subsys.dev_root, &dev_attr_stepping_port);
         if (rc)
-                goto out_unreg_class;
-        rc = sysdev_class_create_file(&etr_sysclass, &attr_stepping_mode);
+                goto out_unreg_subsys;
+        rc = device_create_file(etr_subsys.dev_root, &dev_attr_stepping_mode);
         if (rc)
                 goto out_remove_stepping_port;
         rc = etr_register_port(&etr_port0_dev);
@@ -1395,11 +1396,11 @@ static int __init etr_init_sysfs(void)
 out_remove_port0:
         etr_unregister_port(&etr_port0_dev);
 out_remove_stepping_mode:
-        sysdev_class_remove_file(&etr_sysclass, &attr_stepping_mode);
+        device_remove_file(etr_subsys.dev_root, &dev_attr_stepping_mode);
 out_remove_stepping_port:
-        sysdev_class_remove_file(&etr_sysclass, &attr_stepping_port);
-out_unreg_class:
-        sysdev_class_unregister(&etr_sysclass);
+        device_remove_file(etr_subsys.dev_root, &dev_attr_stepping_port);
+out_unreg_subsys:
+        bus_unregister(&etr_subsys);
 out:
         return rc;
 }
@@ -1599,14 +1600,15 @@ out_unlock:
 }
 
 /*
- * STP class sysfs interface functions
+ * STP subsys sysfs interface functions
  */
-static struct sysdev_class stp_sysclass = {
-        .name   = "stp",
+static struct bus_type stp_subsys = {
+        .name           = "stp",
+        .dev_name       = "stp",
 };
 
-static ssize_t stp_ctn_id_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_ctn_id_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         if (!stp_online)
@@ -1615,10 +1617,10 @@ static ssize_t stp_ctn_id_show(struct sysdev_class *class,
                        *(unsigned long long *) stp_info.ctnid);
 }
 
-static SYSDEV_CLASS_ATTR(ctn_id, 0400, stp_ctn_id_show, NULL);
+static DEVICE_ATTR(ctn_id, 0400, stp_ctn_id_show, NULL);
 
-static ssize_t stp_ctn_type_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_ctn_type_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         if (!stp_online)
@@ -1626,10 +1628,10 @@ static ssize_t stp_ctn_type_show(struct sysdev_class *class,
         return sprintf(buf, "%i\n", stp_info.ctn);
 }
 
-static SYSDEV_CLASS_ATTR(ctn_type, 0400, stp_ctn_type_show, NULL);
+static DEVICE_ATTR(ctn_type, 0400, stp_ctn_type_show, NULL);
 
-static ssize_t stp_dst_offset_show(struct sysdev_class *class,
-                                   struct sysdev_class_attribute *attr,
+static ssize_t stp_dst_offset_show(struct device *dev,
+                                   struct device_attribute *attr,
                                    char *buf)
 {
         if (!stp_online || !(stp_info.vbits & 0x2000))
@@ -1637,10 +1639,10 @@ static ssize_t stp_dst_offset_show(struct sysdev_class *class,
         return sprintf(buf, "%i\n", (int)(s16) stp_info.dsto);
 }
 
-static SYSDEV_CLASS_ATTR(dst_offset, 0400, stp_dst_offset_show, NULL);
+static DEVICE_ATTR(dst_offset, 0400, stp_dst_offset_show, NULL);
 
-static ssize_t stp_leap_seconds_show(struct sysdev_class *class,
-                                        struct sysdev_class_attribute *attr,
+static ssize_t stp_leap_seconds_show(struct device *dev,
+                                        struct device_attribute *attr,
                                         char *buf)
 {
         if (!stp_online || !(stp_info.vbits & 0x8000))
@@ -1648,10 +1650,10 @@ static ssize_t stp_leap_seconds_show(struct sysdev_class *class,
         return sprintf(buf, "%i\n", (int)(s16) stp_info.leaps);
 }
 
-static SYSDEV_CLASS_ATTR(leap_seconds, 0400, stp_leap_seconds_show, NULL);
+static DEVICE_ATTR(leap_seconds, 0400, stp_leap_seconds_show, NULL);
 
-static ssize_t stp_stratum_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_stratum_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         if (!stp_online)
@@ -1659,10 +1661,10 @@ static ssize_t stp_stratum_show(struct sysdev_class *class,
         return sprintf(buf, "%i\n", (int)(s16) stp_info.stratum);
 }
 
-static SYSDEV_CLASS_ATTR(stratum, 0400, stp_stratum_show, NULL);
+static DEVICE_ATTR(stratum, 0400, stp_stratum_show, NULL);
 
-static ssize_t stp_time_offset_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_time_offset_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         if (!stp_online || !(stp_info.vbits & 0x0800))
@@ -1670,10 +1672,10 @@ static ssize_t stp_time_offset_show(struct sysdev_class *class,
         return sprintf(buf, "%i\n", (int) stp_info.tto);
 }
 
-static SYSDEV_CLASS_ATTR(time_offset, 0400, stp_time_offset_show, NULL);
+static DEVICE_ATTR(time_offset, 0400, stp_time_offset_show, NULL);
 
-static ssize_t stp_time_zone_offset_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_time_zone_offset_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         if (!stp_online || !(stp_info.vbits & 0x4000))
@@ -1681,11 +1683,11 @@ static ssize_t stp_time_zone_offset_show(struct sysdev_class *class,
         return sprintf(buf, "%i\n", (int)(s16) stp_info.tzo);
 }
 
-static SYSDEV_CLASS_ATTR(time_zone_offset, 0400,
+static DEVICE_ATTR(time_zone_offset, 0400,
                          stp_time_zone_offset_show, NULL);
 
-static ssize_t stp_timing_mode_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_timing_mode_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         if (!stp_online)
@@ -1693,10 +1695,10 @@ static ssize_t stp_timing_mode_show(struct sysdev_class *class,
         return sprintf(buf, "%i\n", stp_info.tmd);
 }
 
-static SYSDEV_CLASS_ATTR(timing_mode, 0400, stp_timing_mode_show, NULL);
+static DEVICE_ATTR(timing_mode, 0400, stp_timing_mode_show, NULL);
 
-static ssize_t stp_timing_state_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_timing_state_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         if (!stp_online)
@@ -1704,17 +1706,17 @@ static ssize_t stp_timing_state_show(struct sysdev_class *class,
         return sprintf(buf, "%i\n", stp_info.tst);
 }
 
-static SYSDEV_CLASS_ATTR(timing_state, 0400, stp_timing_state_show, NULL);
+static DEVICE_ATTR(timing_state, 0400, stp_timing_state_show, NULL);
 
-static ssize_t stp_online_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_online_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *buf)
 {
         return sprintf(buf, "%i\n", stp_online);
 }
 
-static ssize_t stp_online_store(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
+static ssize_t stp_online_store(struct device *dev,
+                                struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
         unsigned int value;
@@ -1736,47 +1738,47 @@ static ssize_t stp_online_store(struct sysdev_class *class,
 }
 
 /*
- * Can't use SYSDEV_CLASS_ATTR because the attribute should be named
- * stp/online but attr_online already exists in this file ..
+ * Can't use DEVICE_ATTR because the attribute should be named
+ * stp/online but dev_attr_online already exists in this file ..
  */
-static struct sysdev_class_attribute attr_stp_online = {
+static struct device_attribute dev_attr_stp_online = {
         .attr = { .name = "online", .mode = 0600 },
         .show   = stp_online_show,
         .store  = stp_online_store,
 };
 
-static struct sysdev_class_attribute *stp_attributes[] = {
-        &attr_ctn_id,
-        &attr_ctn_type,
-        &attr_dst_offset,
-        &attr_leap_seconds,
-        &attr_stp_online,
-        &attr_stratum,
-        &attr_time_offset,
-        &attr_time_zone_offset,
-        &attr_timing_mode,
-        &attr_timing_state,
+static struct device_attribute *stp_attributes[] = {
+        &dev_attr_ctn_id,
+        &dev_attr_ctn_type,
+        &dev_attr_dst_offset,
+        &dev_attr_leap_seconds,
+        &dev_attr_stp_online,
+        &dev_attr_stratum,
+        &dev_attr_time_offset,
+        &dev_attr_time_zone_offset,
+        &dev_attr_timing_mode,
+        &dev_attr_timing_state,
         NULL
 };
 
 static int __init stp_init_sysfs(void)
 {
-        struct sysdev_class_attribute **attr;
+        struct device_attribute **attr;
         int rc;
 
-        rc = sysdev_class_register(&stp_sysclass);
+        rc = subsys_system_register(&stp_subsys, NULL);
         if (rc)
                 goto out;
         for (attr = stp_attributes; *attr; attr++) {
-                rc = sysdev_class_create_file(&stp_sysclass, *attr);
+                rc = device_create_file(stp_subsys.dev_root, *attr);
                 if (rc)
                         goto out_unreg;
         }
         return 0;
 out_unreg:
         for (; attr >= stp_attributes; attr--)
-                sysdev_class_remove_file(&stp_sysclass, *attr);
-        sysdev_class_unregister(&stp_sysclass);
+                device_remove_file(stp_subsys.dev_root, *attr);
+        bus_unregister(&stp_subsys);
 out:
         return rc;
 }
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index fdb5b8cb260f..6e0e29b29a7b 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -261,7 +261,7 @@ void store_topology(struct sysinfo_15_1_x *info)
 int arch_update_cpu_topology(void)
 {
         struct sysinfo_15_1_x *info = tl_info;
-        struct sys_device *sysdev;
+        struct device *dev;
         int cpu;
 
         if (!MACHINE_HAS_TOPOLOGY) {
@@ -273,8 +273,8 @@ int arch_update_cpu_topology(void)
         tl_to_cores(info);
         update_cpu_core_map();
         for_each_online_cpu(cpu) {
-                sysdev = get_cpu_sysdev(cpu);
-                kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
+                dev = get_cpu_device(cpu);
+                kobject_uevent(&dev->kobj, KOBJ_CHANGE);
         }
         return 1;
 }
diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c
index 83cc704770d7..b1cb2715ad6e 100644
--- a/arch/sh/drivers/dma/dma-sysfs.c
+++ b/arch/sh/drivers/dma/dma-sysfs.c
@@ -12,18 +12,19 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/stat.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
 #include <linux/string.h>
 #include <asm/dma.h>
 
-static struct sysdev_class dma_sysclass = {
+static struct bus_type dma_subsys = {
         .name = "dma",
+        .dev_name = "dma",
 };
 
-static ssize_t dma_show_devices(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t dma_show_devices(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         ssize_t len = 0;
         int i;
@@ -43,29 +44,29 @@ static ssize_t dma_show_devices(struct sys_device *dev,
         return len;
 }
 
-static SYSDEV_ATTR(devices, S_IRUGO, dma_show_devices, NULL);
+static DEVICE_ATTR(devices, S_IRUGO, dma_show_devices, NULL);
 
-static int __init dma_sysclass_init(void)
+static int __init dma_subsys_init(void)
 {
         int ret;
 
-        ret = sysdev_class_register(&dma_sysclass);
+        ret = subsys_system_register(&dma_subsys, NULL);
         if (unlikely(ret))
                 return ret;
 
-        return sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr);
+        return device_create_file(dma_subsys.dev_root, &dev_attr_devices.attr);
 }
-postcore_initcall(dma_sysclass_init);
+postcore_initcall(dma_subsys_init);
 
-static ssize_t dma_show_dev_id(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t dma_show_dev_id(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct dma_channel *channel = to_dma_channel(dev);
         return sprintf(buf, "%s\n", channel->dev_id);
 }
 
-static ssize_t dma_store_dev_id(struct sys_device *dev,
-                                struct sysdev_attribute *attr,
+static ssize_t dma_store_dev_id(struct device *dev,
+                                struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
         struct dma_channel *channel = to_dma_channel(dev);
@@ -73,10 +74,10 @@ static ssize_t dma_store_dev_id(struct sys_device *dev,
         return count;
 }
 
-static SYSDEV_ATTR(dev_id, S_IRUGO | S_IWUSR, dma_show_dev_id, dma_store_dev_id);
+static DEVICE_ATTR(dev_id, S_IRUGO | S_IWUSR, dma_show_dev_id, dma_store_dev_id);
 
-static ssize_t dma_store_config(struct sys_device *dev,
-                                struct sysdev_attribute *attr,
+static ssize_t dma_store_config(struct device *dev,
+                                struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
         struct dma_channel *channel = to_dma_channel(dev);
@@ -88,17 +89,17 @@ static ssize_t dma_store_config(struct sys_device *dev,
         return count;
 }
 
-static SYSDEV_ATTR(config, S_IWUSR, NULL, dma_store_config);
+static DEVICE_ATTR(config, S_IWUSR, NULL, dma_store_config);
 
-static ssize_t dma_show_mode(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t dma_show_mode(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct dma_channel *channel = to_dma_channel(dev);
         return sprintf(buf, "0x%08x\n", channel->mode);
 }
 
-static ssize_t dma_store_mode(struct sys_device *dev,
-                              struct sysdev_attribute *attr,
+static ssize_t dma_store_mode(struct device *dev,
+                              struct device_attribute *attr,
                               const char *buf, size_t count)
 {
         struct dma_channel *channel = to_dma_channel(dev);
@@ -106,38 +107,38 @@ static ssize_t dma_store_mode(struct sys_device *dev,
         return count;
 }
 
-static SYSDEV_ATTR(mode, S_IRUGO | S_IWUSR, dma_show_mode, dma_store_mode);
+static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR, dma_show_mode, dma_store_mode);
 
 #define dma_ro_attr(field, fmt)                                         \
-static ssize_t dma_show_##field(struct sys_device *dev,                 \
-                                struct sysdev_attribute *attr, char *buf)\
+static ssize_t dma_show_##field(struct device *dev,             \
+                                struct device_attribute *attr, char *buf)\
 {                                                                       \
         struct dma_channel *channel = to_dma_channel(dev);              \
         return sprintf(buf, fmt, channel->field);                       \
 }                                                                       \
-static SYSDEV_ATTR(field, S_IRUGO, dma_show_##field, NULL);
+static DEVICE_ATTR(field, S_IRUGO, dma_show_##field, NULL);
 
 dma_ro_attr(count, "0x%08x\n");
 dma_ro_attr(flags, "0x%08lx\n");
 
 int dma_create_sysfs_files(struct dma_channel *chan, struct dma_info *info)
 {
-        struct sys_device *dev = &chan->dev;
+        struct device *dev = &chan->dev;
         char name[16];
         int ret;
 
         dev->id  = chan->vchan;
-        dev->cls = &dma_sysclass;
+        dev->bus = &dma_subsys;
 
-        ret = sysdev_register(dev);
+        ret = device_register(dev);
         if (ret)
                 return ret;
 
-        ret |= sysdev_create_file(dev, &attr_dev_id);
-        ret |= sysdev_create_file(dev, &attr_count);
-        ret |= sysdev_create_file(dev, &attr_mode);
-        ret |= sysdev_create_file(dev, &attr_flags);
-        ret |= sysdev_create_file(dev, &attr_config);
+        ret |= device_create_file(dev, &dev_attr_dev_id);
+        ret |= device_create_file(dev, &dev_attr_count);
+        ret |= device_create_file(dev, &dev_attr_mode);
+        ret |= device_create_file(dev, &dev_attr_flags);
+        ret |= device_create_file(dev, &dev_attr_config);
 
         if (unlikely(ret)) {
                 dev_err(&info->pdev->dev, "Failed creating attrs\n");
@@ -150,17 +151,17 @@ int dma_create_sysfs_files(struct dma_channel *chan, struct dma_info *info)
 
 void dma_remove_sysfs_files(struct dma_channel *chan, struct dma_info *info)
 {
-        struct sys_device *dev = &chan->dev;
+        struct device *dev = &chan->dev;
         char name[16];
 
-        sysdev_remove_file(dev, &attr_dev_id);
-        sysdev_remove_file(dev, &attr_count);
-        sysdev_remove_file(dev, &attr_mode);
-        sysdev_remove_file(dev, &attr_flags);
-        sysdev_remove_file(dev, &attr_config);
+        device_remove_file(dev, &dev_attr_dev_id);
+        device_remove_file(dev, &dev_attr_count);
+        device_remove_file(dev, &dev_attr_mode);
+        device_remove_file(dev, &dev_attr_flags);
+        device_remove_file(dev, &dev_attr_config);
 
         snprintf(name, sizeof(name), "dma%d", chan->chan);
         sysfs_remove_link(&info->pdev->dev.kobj, name);
 
-        sysdev_unregister(dev);
+        device_unregister(dev);
 }
diff --git a/arch/sh/include/asm/dma.h b/arch/sh/include/asm/dma.h
index 07373a074090..6aa2080c0065 100644
--- a/arch/sh/include/asm/dma.h
+++ b/arch/sh/include/asm/dma.h
@@ -14,7 +14,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <cpu/dma.h>
 #include <asm-generic/dma.h>
 
@@ -91,7 +91,7 @@ struct dma_channel {
 
         wait_queue_head_t wait_queue;
 
-        struct sys_device dev;
+        struct device dev;
         void *priv_data;
 };
 
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index f0907995b4c9..a8140f0bbf6c 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/cpu.h>
 #include <linux/bitmap.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -337,9 +337,9 @@ static struct kobj_type ktype_percpu_entry = {
         .default_attrs  = sq_sysfs_attrs,
 };
 
-static int __devinit sq_sysdev_add(struct sys_device *sysdev)
+static int __devinit sq_dev_add(struct device *dev)
 {
-        unsigned int cpu = sysdev->id;
+        unsigned int cpu = dev->id;
         struct kobject *kobj;
         int error;
 
@@ -348,25 +348,27 @@ static int __devinit sq_sysdev_add(struct sys_device *sysdev)
                 return -ENOMEM;
 
         kobj = sq_kobject[cpu];
-        error = kobject_init_and_add(kobj, &ktype_percpu_entry, &sysdev->kobj,
+        error = kobject_init_and_add(kobj, &ktype_percpu_entry, &dev->kobj,
                                      "%s", "sq");
         if (!error)
                 kobject_uevent(kobj, KOBJ_ADD);
         return error;
 }
 
-static int __devexit sq_sysdev_remove(struct sys_device *sysdev)
+static int __devexit sq_dev_remove(struct device *dev)
 {
-        unsigned int cpu = sysdev->id;
+        unsigned int cpu = dev->id;
         struct kobject *kobj = sq_kobject[cpu];
 
         kobject_put(kobj);
         return 0;
 }
 
-static struct sysdev_driver sq_sysdev_driver = {
-        .add            = sq_sysdev_add,
-        .remove         = __devexit_p(sq_sysdev_remove),
+static struct subsys_interface sq_interface = {
+        .name           = "sq"
+        .subsys         = &cpu_subsys,
+        .add_dev        = sq_dev_add,
+        .remove_dev     = __devexit_p(sq_dev_remove),
 };
 
 static int __init sq_api_init(void)
@@ -386,7 +388,7 @@ static int __init sq_api_init(void)
         if (unlikely(!sq_bitmap))
                 goto out;
 
-        ret = sysdev_driver_register(&cpu_sysdev_class, &sq_sysdev_driver);
+        ret = subsys_interface_register(&sq_interface);
         if (unlikely(ret != 0))
                 goto out;
 
@@ -401,7 +403,7 @@ out:
 
 static void __exit sq_api_exit(void)
 {
-        sysdev_driver_unregister(&cpu_sysdev_class, &sq_sysdev_driver);
+        subsys_interface_unregister(&sq_interface);
         kfree(sq_bitmap);
         kmem_cache_destroy(sq_cache);
 }
diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
index 7408201d7efb..654e8aad3bbe 100644
--- a/arch/sparc/kernel/sysfs.c
+++ b/arch/sparc/kernel/sysfs.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
  */
 #include <linux/sched.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/smp.h>
 #include <linux/percpu.h>
@@ -16,13 +16,13 @@
 static DEFINE_PER_CPU(struct hv_mmu_statistics, mmu_stats) __attribute__((aligned(64)));
 
 #define SHOW_MMUSTAT_ULONG(NAME) \
-static ssize_t show_##NAME(struct sys_device *dev, \
-                        struct sysdev_attribute *attr, char *buf) \
+static ssize_t show_##NAME(struct device *dev, \
+                        struct device_attribute *attr, char *buf) \
 { \
         struct hv_mmu_statistics *p = &per_cpu(mmu_stats, dev->id); \
         return sprintf(buf, "%lu\n", p->NAME); \
 } \
-static SYSDEV_ATTR(NAME, 0444, show_##NAME, NULL)
+static DEVICE_ATTR(NAME, 0444, show_##NAME, NULL)
 
 SHOW_MMUSTAT_ULONG(immu_tsb_hits_ctx0_8k_tte);
 SHOW_MMUSTAT_ULONG(immu_tsb_ticks_ctx0_8k_tte);
@@ -58,38 +58,38 @@ SHOW_MMUSTAT_ULONG(dmmu_tsb_hits_ctxnon0_256mb_tte);
 SHOW_MMUSTAT_ULONG(dmmu_tsb_ticks_ctxnon0_256mb_tte);
 
 static struct attribute *mmu_stat_attrs[] = {
-        &attr_immu_tsb_hits_ctx0_8k_tte.attr,
-        &attr_immu_tsb_ticks_ctx0_8k_tte.attr,
-        &attr_immu_tsb_hits_ctx0_64k_tte.attr,
-        &attr_immu_tsb_ticks_ctx0_64k_tte.attr,
-        &attr_immu_tsb_hits_ctx0_4mb_tte.attr,
-        &attr_immu_tsb_ticks_ctx0_4mb_tte.attr,
-        &attr_immu_tsb_hits_ctx0_256mb_tte.attr,
-        &attr_immu_tsb_ticks_ctx0_256mb_tte.attr,
-        &attr_immu_tsb_hits_ctxnon0_8k_tte.attr,
-        &attr_immu_tsb_ticks_ctxnon0_8k_tte.attr,
-        &attr_immu_tsb_hits_ctxnon0_64k_tte.attr,
-        &attr_immu_tsb_ticks_ctxnon0_64k_tte.attr,
-        &attr_immu_tsb_hits_ctxnon0_4mb_tte.attr,
-        &attr_immu_tsb_ticks_ctxnon0_4mb_tte.attr,
-        &attr_immu_tsb_hits_ctxnon0_256mb_tte.attr,
-        &attr_immu_tsb_ticks_ctxnon0_256mb_tte.attr,
-        &attr_dmmu_tsb_hits_ctx0_8k_tte.attr,
-        &attr_dmmu_tsb_ticks_ctx0_8k_tte.attr,
-        &attr_dmmu_tsb_hits_ctx0_64k_tte.attr,
-        &attr_dmmu_tsb_ticks_ctx0_64k_tte.attr,
-        &attr_dmmu_tsb_hits_ctx0_4mb_tte.attr,
-        &attr_dmmu_tsb_ticks_ctx0_4mb_tte.attr,
-        &attr_dmmu_tsb_hits_ctx0_256mb_tte.attr,
-        &attr_dmmu_tsb_ticks_ctx0_256mb_tte.attr,
-        &attr_dmmu_tsb_hits_ctxnon0_8k_tte.attr,
-        &attr_dmmu_tsb_ticks_ctxnon0_8k_tte.attr,
-        &attr_dmmu_tsb_hits_ctxnon0_64k_tte.attr,
-        &attr_dmmu_tsb_ticks_ctxnon0_64k_tte.attr,
-        &attr_dmmu_tsb_hits_ctxnon0_4mb_tte.attr,
-        &attr_dmmu_tsb_ticks_ctxnon0_4mb_tte.attr,
-        &attr_dmmu_tsb_hits_ctxnon0_256mb_tte.attr,
-        &attr_dmmu_tsb_ticks_ctxnon0_256mb_tte.attr,
+        &dev_attr_immu_tsb_hits_ctx0_8k_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctx0_8k_tte.attr,
+        &dev_attr_immu_tsb_hits_ctx0_64k_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctx0_64k_tte.attr,
+        &dev_attr_immu_tsb_hits_ctx0_4mb_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctx0_4mb_tte.attr,
+        &dev_attr_immu_tsb_hits_ctx0_256mb_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctx0_256mb_tte.attr,
+        &dev_attr_immu_tsb_hits_ctxnon0_8k_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctxnon0_8k_tte.attr,
+        &dev_attr_immu_tsb_hits_ctxnon0_64k_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctxnon0_64k_tte.attr,
+        &dev_attr_immu_tsb_hits_ctxnon0_4mb_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctxnon0_4mb_tte.attr,
+        &dev_attr_immu_tsb_hits_ctxnon0_256mb_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctxnon0_256mb_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctx0_8k_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctx0_8k_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctx0_64k_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctx0_64k_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctx0_4mb_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctx0_4mb_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctx0_256mb_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctx0_256mb_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctxnon0_8k_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctxnon0_8k_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctxnon0_64k_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctxnon0_64k_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctxnon0_4mb_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctxnon0_4mb_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctxnon0_256mb_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctxnon0_256mb_tte.attr,
         NULL,
 };
 
@@ -139,15 +139,15 @@ static unsigned long write_mmustat_enable(unsigned long val)
         return sun4v_mmustat_conf(ra, &orig_ra);
 }
 
-static ssize_t show_mmustat_enable(struct sys_device *s,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_mmustat_enable(struct device *s,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned long val = run_on_cpu(s->id, read_mmustat_enable, 0);
         return sprintf(buf, "%lx\n", val);
 }
 
-static ssize_t store_mmustat_enable(struct sys_device *s,
-                        struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_mmustat_enable(struct device *s,
+                        struct device_attribute *attr, const char *buf,
                         size_t count)
 {
         unsigned long val, err;
@@ -163,39 +163,39 @@ static ssize_t store_mmustat_enable(struct sys_device *s,
         return count;
 }
 
-static SYSDEV_ATTR(mmustat_enable, 0644, show_mmustat_enable, store_mmustat_enable);
+static DEVICE_ATTR(mmustat_enable, 0644, show_mmustat_enable, store_mmustat_enable);
 
 static int mmu_stats_supported;
 
-static int register_mmu_stats(struct sys_device *s)
+static int register_mmu_stats(struct device *s)
 {
         if (!mmu_stats_supported)
                 return 0;
-        sysdev_create_file(s, &attr_mmustat_enable);
+        device_create_file(s, &dev_attr_mmustat_enable);
         return sysfs_create_group(&s->kobj, &mmu_stat_group);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static void unregister_mmu_stats(struct sys_device *s)
+static void unregister_mmu_stats(struct device *s)
 {
         if (!mmu_stats_supported)
                 return;
         sysfs_remove_group(&s->kobj, &mmu_stat_group);
-        sysdev_remove_file(s, &attr_mmustat_enable);
+        device_remove_file(s, &dev_attr_mmustat_enable);
 }
 #endif
 
 #define SHOW_CPUDATA_ULONG_NAME(NAME, MEMBER) \
-static ssize_t show_##NAME(struct sys_device *dev, \
-                struct sysdev_attribute *attr, char *buf) \
+static ssize_t show_##NAME(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
 { \
         cpuinfo_sparc *c = &cpu_data(dev->id); \
         return sprintf(buf, "%lu\n", c->MEMBER); \
 }
 
 #define SHOW_CPUDATA_UINT_NAME(NAME, MEMBER) \
-static ssize_t show_##NAME(struct sys_device *dev, \
-                struct sysdev_attribute *attr, char *buf) \
+static ssize_t show_##NAME(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
 { \
         cpuinfo_sparc *c = &cpu_data(dev->id); \
         return sprintf(buf, "%u\n", c->MEMBER); \
@@ -209,14 +209,14 @@ SHOW_CPUDATA_UINT_NAME(l1_icache_line_size, icache_line_size);
 SHOW_CPUDATA_UINT_NAME(l2_cache_size, ecache_size);
 SHOW_CPUDATA_UINT_NAME(l2_cache_line_size, ecache_line_size);
 
-static struct sysdev_attribute cpu_core_attrs[] = {
-        _SYSDEV_ATTR(clock_tick,          0444, show_clock_tick, NULL),
-        _SYSDEV_ATTR(l1_dcache_size,      0444, show_l1_dcache_size, NULL),
-        _SYSDEV_ATTR(l1_dcache_line_size, 0444, show_l1_dcache_line_size, NULL),
-        _SYSDEV_ATTR(l1_icache_size,      0444, show_l1_icache_size, NULL),
-        _SYSDEV_ATTR(l1_icache_line_size, 0444, show_l1_icache_line_size, NULL),
-        _SYSDEV_ATTR(l2_cache_size,       0444, show_l2_cache_size, NULL),
-        _SYSDEV_ATTR(l2_cache_line_size,  0444, show_l2_cache_line_size, NULL),
+static struct device_attribute cpu_core_attrs[] = {
+        __ATTR(clock_tick,          0444, show_clock_tick, NULL),
+        __ATTR(l1_dcache_size,      0444, show_l1_dcache_size, NULL),
+        __ATTR(l1_dcache_line_size, 0444, show_l1_dcache_line_size, NULL),
+        __ATTR(l1_icache_size,      0444, show_l1_icache_size, NULL),
+        __ATTR(l1_icache_line_size, 0444, show_l1_icache_line_size, NULL),
+        __ATTR(l2_cache_size,       0444, show_l2_cache_size, NULL),
+        __ATTR(l2_cache_line_size,  0444, show_l2_cache_line_size, NULL),
 };
 
 static DEFINE_PER_CPU(struct cpu, cpu_devices);
@@ -224,11 +224,11 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
 static void register_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
-        struct sys_device *s = &c->sysdev;
+        struct device *s = &c->dev;
         int i;
 
         for (i = 0; i < ARRAY_SIZE(cpu_core_attrs); i++)
-                sysdev_create_file(s, &cpu_core_attrs[i]);
+                device_create_file(s, &cpu_core_attrs[i]);
 
         register_mmu_stats(s);
 }
@@ -237,12 +237,12 @@ static void register_cpu_online(unsigned int cpu)
 static void unregister_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
-        struct sys_device *s = &c->sysdev;
+        struct device *s = &c->dev;
         int i;
 
         unregister_mmu_stats(s);
         for (i = 0; i < ARRAY_SIZE(cpu_core_attrs); i++)
-                sysdev_remove_file(s, &cpu_core_attrs[i]);
+                device_remove_file(s, &cpu_core_attrs[i]);
 }
 #endif
 
diff --git a/arch/tile/kernel/sysfs.c b/arch/tile/kernel/sysfs.c
index 602908268093..f862b005eb73 100644
--- a/arch/tile/kernel/sysfs.c
+++ b/arch/tile/kernel/sysfs.c
@@ -14,7 +14,7 @@
  * /sys entry support.
  */
 
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
@@ -32,55 +32,55 @@ static ssize_t get_hv_confstr(char *page, int query)
         return n;
 }
 
-static ssize_t chip_width_show(struct sysdev_class *dev,
-                               struct sysdev_class_attribute *attr,
+static ssize_t chip_width_show(struct device *dev,
+                               struct device_attribute *attr,
                                char *page)
 {
         return sprintf(page, "%u\n", smp_width);
 }
-static SYSDEV_CLASS_ATTR(chip_width, 0444, chip_width_show, NULL);
+static DEVICE_ATTR(chip_width, 0444, chip_width_show, NULL);
 
-static ssize_t chip_height_show(struct sysdev_class *dev,
-                                struct sysdev_class_attribute *attr,
+static ssize_t chip_height_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *page)
 {
         return sprintf(page, "%u\n", smp_height);
 }
-static SYSDEV_CLASS_ATTR(chip_height, 0444, chip_height_show, NULL);
+static DEVICE_ATTR(chip_height, 0444, chip_height_show, NULL);
 
-static ssize_t chip_serial_show(struct sysdev_class *dev,
-                                struct sysdev_class_attribute *attr,
+static ssize_t chip_serial_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *page)
 {
         return get_hv_confstr(page, HV_CONFSTR_CHIP_SERIAL_NUM);
 }
-static SYSDEV_CLASS_ATTR(chip_serial, 0444, chip_serial_show, NULL);
+static DEVICE_ATTR(chip_serial, 0444, chip_serial_show, NULL);
 
-static ssize_t chip_revision_show(struct sysdev_class *dev,
-                                  struct sysdev_class_attribute *attr,
+static ssize_t chip_revision_show(struct device *dev,
+                                  struct device_attribute *attr,
                                   char *page)
 {
         return get_hv_confstr(page, HV_CONFSTR_CHIP_REV);
 }
-static SYSDEV_CLASS_ATTR(chip_revision, 0444, chip_revision_show, NULL);
+static DEVICE_ATTR(chip_revision, 0444, chip_revision_show, NULL);
 
 
-static ssize_t type_show(struct sysdev_class *dev,
-                            struct sysdev_class_attribute *attr,
+static ssize_t type_show(struct device *dev,
+                            struct device_attribute *attr,
                             char *page)
 {
         return sprintf(page, "tilera\n");
 }
-static SYSDEV_CLASS_ATTR(type, 0444, type_show, NULL);
+static DEVICE_ATTR(type, 0444, type_show, NULL);
 
 #define HV_CONF_ATTR(name, conf)                                        \
-        static ssize_t name ## _show(struct sysdev_class *dev,          \
-                                     struct sysdev_class_attribute *attr, \
+        static ssize_t name ## _show(struct device *dev,                \
+                                     struct device_attribute *attr, \
                                      char *page)                        \
         {                                                               \
                 return get_hv_confstr(page, conf);                      \
         }                                                               \
-        static SYSDEV_CLASS_ATTR(name, 0444, name ## _show, NULL);
+        static DEVICE_ATTR(name, 0444, name ## _show, NULL);
 
 HV_CONF_ATTR(version,           HV_CONFSTR_HV_SW_VER)
 HV_CONF_ATTR(config_version,    HV_CONFSTR_HV_CONFIG_VER)
@@ -96,15 +96,15 @@ HV_CONF_ATTR(mezz_description,	HV_CONFSTR_MEZZ_DESC)
 HV_CONF_ATTR(switch_control,    HV_CONFSTR_SWITCH_CONTROL)
 
 static struct attribute *board_attrs[] = {
-        &attr_board_part.attr,
-        &attr_board_serial.attr,
-        &attr_board_revision.attr,
-        &attr_board_description.attr,
-        &attr_mezz_part.attr,
-        &attr_mezz_serial.attr,
-        &attr_mezz_revision.attr,
-        &attr_mezz_description.attr,
-        &attr_switch_control.attr,
+        &dev_attr_board_part.attr,
+        &dev_attr_board_serial.attr,
+        &dev_attr_board_revision.attr,
+        &dev_attr_board_description.attr,
+        &dev_attr_mezz_part.attr,
+        &dev_attr_mezz_serial.attr,
+        &dev_attr_mezz_revision.attr,
+        &dev_attr_mezz_description.attr,
+        &dev_attr_switch_control.attr,
         NULL
 };
 
@@ -151,12 +151,11 @@ hvconfig_bin_read(struct file *filp, struct kobject *kobj,
 
 static int __init create_sysfs_entries(void)
 {
-        struct sysdev_class *cls = &cpu_sysdev_class;
         int err = 0;
 
 #define create_cpu_attr(name)                                           \
         if (!err)                                                       \
-                err = sysfs_create_file(&cls->kset.kobj, &attr_##name.attr);
+                err = device_create_file(cpu_subsys.dev_root, &dev_attr_##name);
         create_cpu_attr(chip_width);
         create_cpu_attr(chip_height);
         create_cpu_attr(chip_serial);
@@ -164,7 +163,7 @@ static int __init create_sysfs_entries(void)
 
 #define create_hv_attr(name)                                            \
         if (!err)                                                       \
-                err = sysfs_create_file(hypervisor_kobj, &attr_##name.attr);
+                err = sysfs_create_file(hypervisor_kobj, &dev_attr_##name);
         create_hv_attr(type);
         create_hv_attr(version);
         create_hv_attr(config_version);
diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c
index 1a505a787765..254adeecc61a 100644
--- a/arch/unicore32/kernel/puv3-core.c
+++ b/arch/unicore32/kernel/puv3-core.c
@@ -13,7 +13,6 @@
 
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
diff --git a/arch/unicore32/kernel/puv3-nb0916.c b/arch/unicore32/kernel/puv3-nb0916.c
index e731c561ed4e..37b12a06b499 100644
--- a/arch/unicore32/kernel/puv3-nb0916.c
+++ b/arch/unicore32/kernel/puv3-nb0916.c
@@ -13,7 +13,6 @@
 
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/io.h>
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 0e8ae57d3656..7f06a19718a4 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -149,7 +149,7 @@ static inline void enable_p5_mce(void) {}
 
 void mce_setup(struct mce *m);
 void mce_log(struct mce *m);
-DECLARE_PER_CPU(struct sys_device, mce_sysdev);
+DECLARE_PER_CPU(struct device, mce_device);
 
 /*
  * Maximum banks number.
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index a3b0811693c9..6b45e5e7a901 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -844,8 +844,7 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
 
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
-
-extern struct sysdev_class cpu_sysdev_class; /* from drivers/base/cpu.c */
+#include <linux/cpu.h>
 
 /* pointer to kobject for cpuX/cache */
 static DEFINE_PER_CPU(struct kobject *, ici_cache_kobject);
@@ -1073,9 +1072,9 @@ err_out:
 static DECLARE_BITMAP(cache_dev_map, NR_CPUS);
 
 /* Add/Remove cache interface for CPU device */
-static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
+static int __cpuinit cache_add_dev(struct device *dev)
 {
-        unsigned int cpu = sys_dev->id;
+        unsigned int cpu = dev->id;
         unsigned long i, j;
         struct _index_kobject *this_object;
         struct _cpuid4_info   *this_leaf;
@@ -1087,7 +1086,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
 
         retval = kobject_init_and_add(per_cpu(ici_cache_kobject, cpu),
                                       &ktype_percpu_entry,
-                                      &sys_dev->kobj, "%s", "cache");
+                                      &dev->kobj, "%s", "cache");
         if (retval < 0) {
                 cpuid4_cache_sysfs_exit(cpu);
                 return retval;
@@ -1124,9 +1123,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
         return 0;
 }
 
-static void __cpuinit cache_remove_dev(struct sys_device * sys_dev)
+static void __cpuinit cache_remove_dev(struct device *dev)
 {
-        unsigned int cpu = sys_dev->id;
+        unsigned int cpu = dev->id;
         unsigned long i;
 
         if (per_cpu(ici_cpuid4_info, cpu) == NULL)
@@ -1145,17 +1144,17 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
                                         unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
-        struct sys_device *sys_dev;
+        struct device *dev;
 
-        sys_dev = get_cpu_sysdev(cpu);
+        dev = get_cpu_device(cpu);
         switch (action) {
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
-                cache_add_dev(sys_dev);
+                cache_add_dev(dev);
                 break;
         case CPU_DEAD:
         case CPU_DEAD_FROZEN:
-                cache_remove_dev(sys_dev);
+                cache_remove_dev(dev);
                 break;
         }
         return NOTIFY_OK;
@@ -1174,9 +1173,9 @@ static int __cpuinit cache_sysfs_init(void)
 
         for_each_online_cpu(i) {
                 int err;
-                struct sys_device *sys_dev = get_cpu_sysdev(i);
+                struct device *dev = get_cpu_device(i);
 
-                err = cache_add_dev(sys_dev);
+                err = cache_add_dev(dev);
                 if (err)
                         return err;
         }
diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h
index fefcc69ee8b5..ed44c8a65858 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-internal.h
+++ b/arch/x86/kernel/cpu/mcheck/mce-internal.h
@@ -1,4 +1,4 @@
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <asm/mce.h>
 
 enum severity_level {
@@ -17,7 +17,7 @@ enum severity_level {
 struct mce_bank {
         u64                     ctl;                    /* subevents to enable */
         unsigned char init;                             /* initialise bank? */
-        struct sysdev_attribute attr;                   /* sysdev attribute */
+        struct device_attribute attr;                   /* device attribute */
         char                    attrname[ATTR_LEN];     /* attribute name */
 };
 
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 2af127d4c3d1..c83e3736ce28 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -19,7 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/percpu.h>
 #include <linux/string.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/delay.h>
 #include <linux/ctype.h>
@@ -1770,7 +1770,7 @@ static struct syscore_ops mce_syscore_ops = {
 };
 
 /*
- * mce_sysdev: Sysfs support
+ * mce_device: Sysfs support
  */
 
 static void mce_cpu_restart(void *data)
@@ -1806,27 +1806,28 @@ static void mce_enable_ce(void *all)
                 __mcheck_cpu_init_timer();
 }
 
-static struct sysdev_class mce_sysdev_class = {
+static struct bus_type mce_subsys = {
         .name           = "machinecheck",
+        .dev_name       = "machinecheck",
 };
 
-DEFINE_PER_CPU(struct sys_device, mce_sysdev);
+DEFINE_PER_CPU(struct device, mce_device);
 
 __cpuinitdata
 void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);
 
-static inline struct mce_bank *attr_to_bank(struct sysdev_attribute *attr)
+static inline struct mce_bank *attr_to_bank(struct device_attribute *attr)
 {
         return container_of(attr, struct mce_bank, attr);
 }
 
-static ssize_t show_bank(struct sys_device *s, struct sysdev_attribute *attr,
+static ssize_t show_bank(struct device *s, struct device_attribute *attr,
                          char *buf)
 {
         return sprintf(buf, "%llx\n", attr_to_bank(attr)->ctl);
 }
 
-static ssize_t set_bank(struct sys_device *s, struct sysdev_attribute *attr,
+static ssize_t set_bank(struct device *s, struct device_attribute *attr,
                         const char *buf, size_t size)
 {
         u64 new;
@@ -1841,14 +1842,14 @@ static ssize_t set_bank(struct sys_device *s, struct sysdev_attribute *attr,
 }
 
 static ssize_t
-show_trigger(struct sys_device *s, struct sysdev_attribute *attr, char *buf)
+show_trigger(struct device *s, struct device_attribute *attr, char *buf)
 {
         strcpy(buf, mce_helper);
         strcat(buf, "\n");
         return strlen(mce_helper) + 1;
 }
 
-static ssize_t set_trigger(struct sys_device *s, struct sysdev_attribute *attr,
+static ssize_t set_trigger(struct device *s, struct device_attribute *attr,
                                 const char *buf, size_t siz)
 {
         char *p;
@@ -1863,8 +1864,8 @@ static ssize_t set_trigger(struct sys_device *s, struct sysdev_attribute *attr,
         return strlen(mce_helper) + !!p;
 }
 
-static ssize_t set_ignore_ce(struct sys_device *s,
-                             struct sysdev_attribute *attr,
+static ssize_t set_ignore_ce(struct device *s,
+                             struct device_attribute *attr,
                              const char *buf, size_t size)
 {
         u64 new;
@@ -1887,8 +1888,8 @@ static ssize_t set_ignore_ce(struct sys_device *s,
         return size;
 }
 
-static ssize_t set_cmci_disabled(struct sys_device *s,
-                                 struct sysdev_attribute *attr,
+static ssize_t set_cmci_disabled(struct device *s,
+                                 struct device_attribute *attr,
                                  const char *buf, size_t size)
 {
         u64 new;
@@ -1910,108 +1911,107 @@ static ssize_t set_cmci_disabled(struct sys_device *s,
         return size;
 }
 
-static ssize_t store_int_with_restart(struct sys_device *s,
-                                      struct sysdev_attribute *attr,
+static ssize_t store_int_with_restart(struct device *s,
+                                      struct device_attribute *attr,
                                       const char *buf, size_t size)
 {
-        ssize_t ret = sysdev_store_int(s, attr, buf, size);
+        ssize_t ret = device_store_int(s, attr, buf, size);
         mce_restart();
         return ret;
 }
 
-static SYSDEV_ATTR(trigger, 0644, show_trigger, set_trigger);
-static SYSDEV_INT_ATTR(tolerant, 0644, tolerant);
-static SYSDEV_INT_ATTR(monarch_timeout, 0644, monarch_timeout);
-static SYSDEV_INT_ATTR(dont_log_ce, 0644, mce_dont_log_ce);
+static DEVICE_ATTR(trigger, 0644, show_trigger, set_trigger);
+static DEVICE_INT_ATTR(tolerant, 0644, tolerant);
+static DEVICE_INT_ATTR(monarch_timeout, 0644, monarch_timeout);
+static DEVICE_INT_ATTR(dont_log_ce, 0644, mce_dont_log_ce);
 
-static struct sysdev_ext_attribute attr_check_interval = {
-        _SYSDEV_ATTR(check_interval, 0644, sysdev_show_int,
-                     store_int_with_restart),
+static struct dev_ext_attribute dev_attr_check_interval = {
+        __ATTR(check_interval, 0644, device_show_int, store_int_with_restart),
         &check_interval
 };
 
-static struct sysdev_ext_attribute attr_ignore_ce = {
-        _SYSDEV_ATTR(ignore_ce, 0644, sysdev_show_int, set_ignore_ce),
+static struct dev_ext_attribute dev_attr_ignore_ce = {
+        __ATTR(ignore_ce, 0644, device_show_int, set_ignore_ce),
         &mce_ignore_ce
 };
 
-static struct sysdev_ext_attribute attr_cmci_disabled = {
-        _SYSDEV_ATTR(cmci_disabled, 0644, sysdev_show_int, set_cmci_disabled),
+static struct dev_ext_attribute dev_attr_cmci_disabled = {
+        __ATTR(cmci_disabled, 0644, device_show_int, set_cmci_disabled),
         &mce_cmci_disabled
 };
 
-static struct sysdev_attribute *mce_sysdev_attrs[] = {
-        &attr_tolerant.attr,
-        &attr_check_interval.attr,
-        &attr_trigger,
-        &attr_monarch_timeout.attr,
-        &attr_dont_log_ce.attr,
-        &attr_ignore_ce.attr,
-        &attr_cmci_disabled.attr,
+static struct device_attribute *mce_device_attrs[] = {
+        &dev_attr_tolerant.attr,
+        &dev_attr_check_interval.attr,
+        &dev_attr_trigger,
+        &dev_attr_monarch_timeout.attr,
+        &dev_attr_dont_log_ce.attr,
+        &dev_attr_ignore_ce.attr,
+        &dev_attr_cmci_disabled.attr,
         NULL
 };
 
-static cpumask_var_t mce_sysdev_initialized;
+static cpumask_var_t mce_device_initialized;
 
-/* Per cpu sysdev init. All of the cpus still share the same ctrl bank: */
-static __cpuinit int mce_sysdev_create(unsigned int cpu)
+/* Per cpu device init. All of the cpus still share the same ctrl bank: */
+static __cpuinit int mce_device_create(unsigned int cpu)
 {
-        struct sys_device *sysdev = &per_cpu(mce_sysdev, cpu);
+        struct device *dev = &per_cpu(mce_device, cpu);
         int err;
         int i, j;
 
         if (!mce_available(&boot_cpu_data))
                 return -EIO;
 
-        memset(&sysdev->kobj, 0, sizeof(struct kobject));
-        sysdev->id  = cpu;
-        sysdev->cls = &mce_sysdev_class;
+        memset(&dev->kobj, 0, sizeof(struct kobject));
+        dev->id  = cpu;
+        dev->bus = &mce_subsys;
 
-        err = sysdev_register(sysdev);
+        err = device_register(dev);
         if (err)
                 return err;
 
-        for (i = 0; mce_sysdev_attrs[i]; i++) {
-                err = sysdev_create_file(sysdev, mce_sysdev_attrs[i]);
+        for (i = 0; mce_device_attrs[i]; i++) {
+                err = device_create_file(dev, mce_device_attrs[i]);
                 if (err)
                         goto error;
         }
         for (j = 0; j < banks; j++) {
-                err = sysdev_create_file(sysdev, &mce_banks[j].attr);
+                err = device_create_file(dev, &mce_banks[j].attr);
                 if (err)
                         goto error2;
         }
-        cpumask_set_cpu(cpu, mce_sysdev_initialized);
+        cpumask_set_cpu(cpu, mce_device_initialized);
 
         return 0;
 error2:
         while (--j >= 0)
-                sysdev_remove_file(sysdev, &mce_banks[j].attr);
+                device_remove_file(dev, &mce_banks[j].attr);
 error:
         while (--i >= 0)
-                sysdev_remove_file(sysdev, mce_sysdev_attrs[i]);
+                device_remove_file(dev, mce_device_attrs[i]);
 
-        sysdev_unregister(sysdev);
+        device_unregister(dev);
 
         return err;
 }
 
-static __cpuinit void mce_sysdev_remove(unsigned int cpu)
+static __cpuinit void mce_device_remove(unsigned int cpu)
 {
-        struct sys_device *sysdev = &per_cpu(mce_sysdev, cpu);
+        struct device *dev = &per_cpu(mce_device, cpu);
         int i;
 
-        if (!cpumask_test_cpu(cpu, mce_sysdev_initialized))
+        if (!cpumask_test_cpu(cpu, mce_device_initialized))
                 return;
 
-        for (i = 0; mce_sysdev_attrs[i]; i++)
-                sysdev_remove_file(sysdev, mce_sysdev_attrs[i]);
+        for (i = 0; mce_device_attrs[i]; i++)
+                device_remove_file(dev, mce_device_attrs[i]);
 
         for (i = 0; i < banks; i++)
-                sysdev_remove_file(sysdev, &mce_banks[i].attr);
+                device_remove_file(dev, &mce_banks[i].attr);
 
-        sysdev_unregister(sysdev);
-        cpumask_clear_cpu(cpu, mce_sysdev_initialized);
+        device_unregister(dev);
+        cpumask_clear_cpu(cpu, mce_device_initialized);
 }
 
 /* Make sure there are no machine checks on offlined CPUs. */
@@ -2061,7 +2061,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
         switch (action) {
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
-                mce_sysdev_create(cpu);
+                mce_device_create(cpu);
                 if (threshold_cpu_callback)
                         threshold_cpu_callback(action, cpu);
                 break;
@@ -2069,7 +2069,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
         case CPU_DEAD_FROZEN:
                 if (threshold_cpu_callback)
                         threshold_cpu_callback(action, cpu);
-                mce_sysdev_remove(cpu);
+                mce_device_remove(cpu);
                 break;
         case CPU_DOWN_PREPARE:
         case CPU_DOWN_PREPARE_FROZEN:
@@ -2103,7 +2103,7 @@ static __init void mce_init_banks(void)
 
         for (i = 0; i < banks; i++) {
                 struct mce_bank *b = &mce_banks[i];
-                struct sysdev_attribute *a = &b->attr;
+                struct device_attribute *a = &b->attr;
 
                 sysfs_attr_init(&a->attr);
                 a->attr.name    = b->attrname;
@@ -2123,16 +2123,16 @@ static __init int mcheck_init_device(void)
         if (!mce_available(&boot_cpu_data))
                 return -EIO;
 
-        zalloc_cpumask_var(&mce_sysdev_initialized, GFP_KERNEL);
+        zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL);
 
         mce_init_banks();
 
-        err = sysdev_class_register(&mce_sysdev_class);
+        err = subsys_system_register(&mce_subsys, NULL);
         if (err)
                 return err;
 
         for_each_online_cpu(i) {
-                err = mce_sysdev_create(i);
+                err = mce_device_create(i);
                 if (err)
                         return err;
         }
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index f5474218cffe..56d2aa1acd55 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -17,7 +17,6 @@
 #include <linux/notifier.h>
 #include <linux/kobject.h>
 #include <linux/percpu.h>
-#include <linux/sysdev.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/sysfs.h>
@@ -548,7 +547,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
                 if (!b)
                         goto out;
 
-                err = sysfs_create_link(&per_cpu(mce_sysdev, cpu).kobj,
+                err = sysfs_create_link(&per_cpu(mce_device, cpu).kobj,
                                         b->kobj, name);
                 if (err)
                         goto out;
@@ -571,7 +570,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
                 goto out;
         }
 
-        b->kobj = kobject_create_and_add(name, &per_cpu(mce_sysdev, cpu).kobj);
+        b->kobj = kobject_create_and_add(name, &per_cpu(mce_device, cpu).kobj);
         if (!b->kobj)
                 goto out_free;
 
@@ -591,7 +590,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
                 if (i == cpu)
                         continue;
 
-                err = sysfs_create_link(&per_cpu(mce_sysdev, i).kobj,
+                err = sysfs_create_link(&per_cpu(mce_device, i).kobj,
                                         b->kobj, name);
                 if (err)
                         goto out;
@@ -669,7 +668,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
 #ifdef CONFIG_SMP
         /* sibling symlink */
         if (shared_bank[bank] && b->blocks->cpu != cpu) {
-                sysfs_remove_link(&per_cpu(mce_sysdev, cpu).kobj, name);
+                sysfs_remove_link(&per_cpu(mce_device, cpu).kobj, name);
                 per_cpu(threshold_banks, cpu)[bank] = NULL;
 
                 return;
@@ -681,7 +680,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
                 if (i == cpu)
                         continue;
 
-                sysfs_remove_link(&per_cpu(mce_sysdev, i).kobj, name);
+                sysfs_remove_link(&per_cpu(mce_device, i).kobj, name);
                 per_cpu(threshold_banks, i)[bank] = NULL;
         }
 
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 787e06c84ea6..59e3f6ed265f 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/percpu.h>
 #include <linux/export.h>
-#include <linux/sysdev.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/smp.h>
@@ -69,16 +68,16 @@ static atomic_t therm_throt_en	= ATOMIC_INIT(0);
 static u32 lvtthmr_init __read_mostly;
 
 #ifdef CONFIG_SYSFS
-#define define_therm_throt_sysdev_one_ro(_name)                         \
-        static SYSDEV_ATTR(_name, 0444,                                 \
-                           therm_throt_sysdev_show_##_name,             \
+#define define_therm_throt_device_one_ro(_name)                         \
+        static DEVICE_ATTR(_name, 0444,                                 \
+                           therm_throt_device_show_##_name,             \
                                    NULL)                                \
 
-#define define_therm_throt_sysdev_show_func(event, name)                \
+#define define_therm_throt_device_show_func(event, name)                \
                                                                         \
-static ssize_t therm_throt_sysdev_show_##event##_##name(                \
-                        struct sys_device *dev,                         \
-                        struct sysdev_attribute *attr,                  \
+static ssize_t therm_throt_device_show_##event##_##name(                \
+                        struct device *dev,                             \
+                        struct device_attribute *attr,                  \
                         char *buf)                                      \
 {                                                                       \
         unsigned int cpu = dev->id;                                     \
@@ -95,20 +94,20 @@ static ssize_t therm_throt_sysdev_show_##event##_##name(		\
         return ret;                                                     \
 }
 
-define_therm_throt_sysdev_show_func(core_throttle, count);
-define_therm_throt_sysdev_one_ro(core_throttle_count);
+define_therm_throt_device_show_func(core_throttle, count);
+define_therm_throt_device_one_ro(core_throttle_count);
 
-define_therm_throt_sysdev_show_func(core_power_limit, count);
-define_therm_throt_sysdev_one_ro(core_power_limit_count);
+define_therm_throt_device_show_func(core_power_limit, count);
+define_therm_throt_device_one_ro(core_power_limit_count);
 
-define_therm_throt_sysdev_show_func(package_throttle, count);
-define_therm_throt_sysdev_one_ro(package_throttle_count);
+define_therm_throt_device_show_func(package_throttle, count);
+define_therm_throt_device_one_ro(package_throttle_count);
 
-define_therm_throt_sysdev_show_func(package_power_limit, count);
-define_therm_throt_sysdev_one_ro(package_power_limit_count);
+define_therm_throt_device_show_func(package_power_limit, count);
+define_therm_throt_device_one_ro(package_power_limit_count);
 
 static struct attribute *thermal_throttle_attrs[] = {
-        &attr_core_throttle_count.attr,
+        &dev_attr_core_throttle_count.attr,
         NULL
 };
 
@@ -223,36 +222,36 @@ static int thresh_event_valid(int event)
 
 #ifdef CONFIG_SYSFS
 /* Add/Remove thermal_throttle interface for CPU device: */
-static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev,
+static __cpuinit int thermal_throttle_add_dev(struct device *dev,
                                 unsigned int cpu)
 {
         int err;
         struct cpuinfo_x86 *c = &cpu_data(cpu);
 
-        err = sysfs_create_group(&sys_dev->kobj, &thermal_attr_group);
+        err = sysfs_create_group(&dev->kobj, &thermal_attr_group);
         if (err)
                 return err;
 
         if (cpu_has(c, X86_FEATURE_PLN))
-                err = sysfs_add_file_to_group(&sys_dev->kobj,
-                                              &attr_core_power_limit_count.attr,
+                err = sysfs_add_file_to_group(&dev->kobj,
+                                              &dev_attr_core_power_limit_count.attr,
                                               thermal_attr_group.name);
         if (cpu_has(c, X86_FEATURE_PTS)) {
-                err = sysfs_add_file_to_group(&sys_dev->kobj,
-                                              &attr_package_throttle_count.attr,
+                err = sysfs_add_file_to_group(&dev->kobj,
+                                              &dev_attr_package_throttle_count.attr,
                                               thermal_attr_group.name);
                 if (cpu_has(c, X86_FEATURE_PLN))
-                        err = sysfs_add_file_to_group(&sys_dev->kobj,
-                                        &attr_package_power_limit_count.attr,
+                        err = sysfs_add_file_to_group(&dev->kobj,
+                                        &dev_attr_package_power_limit_count.attr,
                                         thermal_attr_group.name);
         }
 
         return err;
 }
 
-static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev)
+static __cpuinit void thermal_throttle_remove_dev(struct device *dev)
 {
-        sysfs_remove_group(&sys_dev->kobj, &thermal_attr_group);
+        sysfs_remove_group(&dev->kobj, &thermal_attr_group);
 }
 
 /* Mutex protecting device creation against CPU hotplug: */
@@ -265,16 +264,16 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,
                               void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
-        struct sys_device *sys_dev;
+        struct device *dev;
         int err = 0;
 
-        sys_dev = get_cpu_sysdev(cpu);
+        dev = get_cpu_device(cpu);
 
         switch (action) {
         case CPU_UP_PREPARE:
         case CPU_UP_PREPARE_FROZEN:
                 mutex_lock(&therm_cpu_lock);
-                err = thermal_throttle_add_dev(sys_dev, cpu);
+                err = thermal_throttle_add_dev(dev, cpu);
                 mutex_unlock(&therm_cpu_lock);
                 WARN_ON(err);
                 break;
@@ -283,7 +282,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,
         case CPU_DEAD:
         case CPU_DEAD_FROZEN:
                 mutex_lock(&therm_cpu_lock);
-                thermal_throttle_remove_dev(sys_dev);
+                thermal_throttle_remove_dev(dev);
                 mutex_unlock(&therm_cpu_lock);
                 break;
         }
@@ -310,7 +309,7 @@ static __init int thermal_throttle_init_device(void)
 #endif
         /* connect live CPUs to sysfs */
         for_each_online_cpu(cpu) {
-                err = thermal_throttle_add_dev(get_cpu_sysdev(cpu), cpu);
+                err = thermal_throttle_add_dev(get_cpu_device(cpu), cpu);
                 WARN_ON(err);
         }
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 1bb0bf4d92cd..56258f1c488e 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -2,7 +2,6 @@
 #include <linux/clockchips.h>
 #include <linux/interrupt.h>
 #include <linux/export.h>
-#include <linux/sysdev.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/i8253.h>
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
index b3300e6bacef..313fb5cddbce 100644
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
@@ -9,7 +9,7 @@
 #include <linux/kprobes.h>
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/bitops.h>
 #include <linux/acpi.h>
 #include <linux/io.h>
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 9d46f5e43b51..c6aa7eb6cda4 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -292,8 +292,8 @@ static int reload_for_cpu(int cpu)
         return err;
 }
 
-static ssize_t reload_store(struct sys_device *dev,
-                            struct sysdev_attribute *attr,
+static ssize_t reload_store(struct device *dev,
+                            struct device_attribute *attr,
                             const char *buf, size_t size)
 {
         unsigned long val;
@@ -318,30 +318,30 @@ static ssize_t reload_store(struct sys_device *dev,
         return ret;
 }
 
-static ssize_t version_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t version_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         struct ucode_cpu_info *uci = ucode_cpu_info + dev->id;
 
         return sprintf(buf, "0x%x\n", uci->cpu_sig.rev);
 }
 
-static ssize_t pf_show(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t pf_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         struct ucode_cpu_info *uci = ucode_cpu_info + dev->id;
 
         return sprintf(buf, "0x%x\n", uci->cpu_sig.pf);
 }
 
-static SYSDEV_ATTR(reload, 0200, NULL, reload_store);
-static SYSDEV_ATTR(version, 0400, version_show, NULL);
-static SYSDEV_ATTR(processor_flags, 0400, pf_show, NULL);
+static DEVICE_ATTR(reload, 0200, NULL, reload_store);
+static DEVICE_ATTR(version, 0400, version_show, NULL);
+static DEVICE_ATTR(processor_flags, 0400, pf_show, NULL);
 
 static struct attribute *mc_default_attrs[] = {
-        &attr_reload.attr,
-        &attr_version.attr,
-        &attr_processor_flags.attr,
+        &dev_attr_reload.attr,
+        &dev_attr_version.attr,
+        &dev_attr_processor_flags.attr,
         NULL
 };
 
@@ -405,43 +405,45 @@ static enum ucode_state microcode_update_cpu(int cpu)
         return ustate;
 }
 
-static int mc_sysdev_add(struct sys_device *sys_dev)
+static int mc_device_add(struct device *dev, struct subsys_interface *sif)
 {
-        int err, cpu = sys_dev->id;
+        int err, cpu = dev->id;
 
         if (!cpu_online(cpu))
                 return 0;
 
         pr_debug("CPU%d added\n", cpu);
 
-        err = sysfs_create_group(&sys_dev->kobj, &mc_attr_group);
+        err = sysfs_create_group(&dev->kobj, &mc_attr_group);
         if (err)
                 return err;
 
         if (microcode_init_cpu(cpu) == UCODE_ERROR) {
-                sysfs_remove_group(&sys_dev->kobj, &mc_attr_group);
+                sysfs_remove_group(&dev->kobj, &mc_attr_group);
                 return -EINVAL;
         }
 
         return err;
 }
 
-static int mc_sysdev_remove(struct sys_device *sys_dev)
+static int mc_device_remove(struct device *dev, struct subsys_interface *sif)
 {
-        int cpu = sys_dev->id;
+        int cpu = dev->id;
 
         if (!cpu_online(cpu))
                 return 0;
 
         pr_debug("CPU%d removed\n", cpu);
         microcode_fini_cpu(cpu);
-        sysfs_remove_group(&sys_dev->kobj, &mc_attr_group);
+        sysfs_remove_group(&dev->kobj, &mc_attr_group);
         return 0;
 }
 
-static struct sysdev_driver mc_sysdev_driver = {
-        .add                    = mc_sysdev_add,
-        .remove                 = mc_sysdev_remove,
+static struct subsys_interface mc_cpu_interface = {
+        .name                   = "microcode",
+        .subsys                 = &cpu_subsys,
+        .add_dev                = mc_device_add,
+        .remove_dev             = mc_device_remove,
 };
 
 /**
@@ -464,9 +466,9 @@ static __cpuinit int
 mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
-        struct sys_device *sys_dev;
+        struct device *dev;
 
-        sys_dev = get_cpu_sysdev(cpu);
+        dev = get_cpu_device(cpu);
         switch (action) {
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
@@ -474,13 +476,13 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
         case CPU_DOWN_FAILED:
         case CPU_DOWN_FAILED_FROZEN:
                 pr_debug("CPU%d added\n", cpu);
-                if (sysfs_create_group(&sys_dev->kobj, &mc_attr_group))
+                if (sysfs_create_group(&dev->kobj, &mc_attr_group))
                         pr_err("Failed to create group for CPU%d\n", cpu);
                 break;
         case CPU_DOWN_PREPARE:
         case CPU_DOWN_PREPARE_FROZEN:
                 /* Suspend is in progress, only remove the interface */
-                sysfs_remove_group(&sys_dev->kobj, &mc_attr_group);
+                sysfs_remove_group(&dev->kobj, &mc_attr_group);
                 pr_debug("CPU%d removed\n", cpu);
                 break;
 
@@ -525,7 +527,7 @@ static int __init microcode_init(void)
         get_online_cpus();
         mutex_lock(&microcode_mutex);
 
-        error = sysdev_driver_register(&cpu_sysdev_class, &mc_sysdev_driver);
+        error = subsys_interface_register(&mc_cpu_interface);
 
         mutex_unlock(&microcode_mutex);
         put_online_cpus();
@@ -535,7 +537,7 @@ static int __init microcode_init(void)
 
         error = microcode_dev_init();
         if (error)
-                goto out_sysdev_driver;
+                goto out_driver;
 
         register_syscore_ops(&mc_syscore_ops);
         register_hotcpu_notifier(&mc_cpu_notifier);
@@ -545,11 +547,11 @@ static int __init microcode_init(void)
 
         return 0;
 
-out_sysdev_driver:
+out_driver:
         get_online_cpus();
         mutex_lock(&microcode_mutex);
 
-        sysdev_driver_unregister(&cpu_sysdev_class, &mc_sysdev_driver);
+        subsys_interface_unregister(&mc_cpu_interface);
 
         mutex_unlock(&microcode_mutex);
         put_online_cpus();
@@ -571,7 +573,7 @@ static void __exit microcode_exit(void)
         get_online_cpus();
         mutex_lock(&microcode_mutex);
 
-        sysdev_driver_unregister(&cpu_sysdev_class, &mc_sysdev_driver);
+        subsys_interface_unregister(&mc_cpu_interface);
 
         mutex_unlock(&microcode_mutex);
         put_online_cpus();
diff --git a/arch/x86/platform/uv/uv_sysfs.c b/arch/x86/platform/uv/uv_sysfs.c
index 309c70fb7759..5d4ba301e776 100644
--- a/arch/x86/platform/uv/uv_sysfs.c
+++ b/arch/x86/platform/uv/uv_sysfs.c
@@ -19,7 +19,7 @@
  *  Copyright (c) Russ Anderson
  */
 
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <asm/uv/bios.h>
 #include <asm/uv/uv.h>