aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-12-21 19:01:38 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-21 19:01:38 -0500
commit4a858cfc9af87cc60b3113c3b7b377a4305eac6a (patch)
tree22ab8aa44aab760d2e1afcb8559e4debe6092d28 /arch/arm/mach-s5pc100
parent8f1e938db9230d9f828420adea96f691c722e473 (diff)
arm: convert sysdev_class to a regular subsystem
After all sysdev classes are ported to regular driver core entities, the sysdev implementation will be entirely removed from the kernel. Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Vinod Koul <vinod.koul@intel.com> Cc: Boojin Kim <boojin.kim@samsung.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi> Cc: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r--arch/arm/mach-s5pc100/cpu.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c
index fd2708e7d8a9..af52c09291b1 100644
--- a/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c
@@ -21,7 +21,7 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/clk.h> 22#include <linux/clk.h>
23#include <linux/io.h> 23#include <linux/io.h>
24#include <linux/sysdev.h> 24#include <linux/device.h>
25#include <linux/serial_core.h> 25#include <linux/serial_core.h>
26#include <linux/platform_device.h> 26#include <linux/platform_device.h>
27#include <linux/sched.h> 27#include <linux/sched.h>
@@ -143,17 +143,18 @@ void __init s5pc100_init_irq(void)
143 s5p_init_irq(vic, ARRAY_SIZE(vic)); 143 s5p_init_irq(vic, ARRAY_SIZE(vic));
144} 144}
145 145
146static struct sysdev_class s5pc100_sysclass = { 146static struct bus_type s5pc100_subsys = {
147 .name = "s5pc100-core", 147 .name = "s5pc100-core",
148 .dev_name = "s5pc100-core",
148}; 149};
149 150
150static struct sys_device s5pc100_sysdev = { 151static struct device s5pc100_dev = {
151 .cls = &s5pc100_sysclass, 152 .bus = &s5pc100_subsys,
152}; 153};
153 154
154static int __init s5pc100_core_init(void) 155static int __init s5pc100_core_init(void)
155{ 156{
156 return sysdev_class_register(&s5pc100_sysclass); 157 return subsys_system_register(&s5pc100_subsys, NULL);
157} 158}
158 159
159core_initcall(s5pc100_core_init); 160core_initcall(s5pc100_core_init);
@@ -165,5 +166,5 @@ int __init s5pc100_init(void)
165 /* set idle function */ 166 /* set idle function */
166 pm_idle = s5pc100_idle; 167 pm_idle = s5pc100_idle;
167 168
168 return sysdev_register(&s5pc100_sysdev); 169 return device_register(&s5pc100_sys);
169} 170}