]> git.openfabrics.org - ~shefty/rdma-dev.git/blobdiff - arch/arm/mach-exynos/common.c
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[~shefty/rdma-dev.git] / arch / arm / mach-exynos / common.c
index 5de4214fa78ff9fe26f3acb9cdf4c263d9cbc9a3..647c8434610c724820f86b387d4b5afe8753d293 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #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 <linux/sched.h>
 #include <linux/serial_core.h>
 #include <linux/gpio.h>
 #include <linux/sched.h>
 #include <linux/serial_core.h>
@@ -173,11 +173,6 @@ static struct map_desc exynos4_iodesc[] __initdata = {
                .pfn            = __phys_to_pfn(EXYNOS4_PA_DMC0),
                .length         = SZ_4K,
                .type           = MT_DEVICE,
                .pfn            = __phys_to_pfn(EXYNOS4_PA_DMC0),
                .length         = SZ_4K,
                .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S5P_VA_SROMC,
-               .pfn            = __phys_to_pfn(EXYNOS4_PA_SROMC),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
        }, {
                .virtual        = (unsigned long)S3C_VA_USB_HSPHY,
                .pfn            = __phys_to_pfn(EXYNOS4_PA_HSPHY),
        }, {
                .virtual        = (unsigned long)S3C_VA_USB_HSPHY,
                .pfn            = __phys_to_pfn(EXYNOS4_PA_HSPHY),
@@ -414,17 +409,18 @@ void __init exynos4_init_irq(void)
        s5p_init_irq(NULL, 0);
 }
 
        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)
 {
 };
 
 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);
 
 }
 core_initcall(exynos4_core_init);
 
@@ -461,7 +457,7 @@ int __init exynos_init(void)
        /* set idle function */
        pm_idle = exynos_idle;
 
        /* set idle function */
        pm_idle = exynos_idle;
 
-       return sysdev_register(&exynos4_sysdev);
+       return device_register(&exynos4_dev);
 }
 
 static struct s3c24xx_uart_clksrc exynos4_serial_clocks[] = {
 }
 
 static struct s3c24xx_uart_clksrc exynos4_serial_clocks[] = {