Commit 1a28d3fd authored by Patrick Mochel's avatar Patrick Mochel

[i8259] Convert to use new system device API.

parent 3cc944bb
...@@ -238,35 +238,31 @@ void mask_and_ack_8259A(unsigned int irq) ...@@ -238,35 +238,31 @@ void mask_and_ack_8259A(unsigned int irq)
} }
} }
static int i8259A_resume(struct device *dev, u32 level) static int i8259A_resume(struct sys_device *dev)
{ {
if (level == RESUME_POWER_ON)
init_8259A(0); init_8259A(0);
return 0; return 0;
} }
static struct device_driver i8259A_driver = { static struct sysdev_class i8259_sysdev_class = {
.name = "pic", set_kset_name("i8259"),
.bus = &system_bus_type,
.resume = i8259A_resume, .resume = i8259A_resume,
}; };
static struct sys_device device_i8259A = { static struct sys_device device_i8259A = {
.name = "pic",
.id = 0, .id = 0,
.dev = { .cls = &i8259_sysdev_class,
.name = "i8259A PIC",
.driver = &i8259A_driver,
},
}; };
static int __init init_8259A_devicefs(void) static int __init i8259A_init_sysfs(void)
{ {
driver_register(&i8259A_driver); int error = sysdev_class_register(&i8259_sysdev_class);
return sys_device_register(&device_i8259A); if (!error)
error = sys_device_register(&device_i8259A);
return error;
} }
device_initcall(init_8259A_devicefs); device_initcall(i8259A_init_sysfs);
void init_8259A(int auto_eoi) void init_8259A(int auto_eoi)
{ {
...@@ -385,35 +381,31 @@ static void setup_timer(void) ...@@ -385,35 +381,31 @@ static void setup_timer(void)
spin_unlock_irqrestore(&i8253_lock, flags); spin_unlock_irqrestore(&i8253_lock, flags);
} }
static int timer_resume(struct device *dev, u32 level) static int timer_resume(struct sys_device *dev)
{ {
if (level == RESUME_POWER_ON)
setup_timer(); setup_timer();
return 0; return 0;
} }
static struct device_driver timer_driver = { static struct sysdev_class timer_sysclass = {
.name = "timer", set_kset_name("timer"),
.bus = &system_bus_type,
.resume = timer_resume, .resume = timer_resume,
}; };
static struct sys_device device_timer = { static struct sys_device device_timer = {
.name = "timer",
.id = 0, .id = 0,
.dev = { .cls = &timer_sysclass,
.name = "timer",
.driver = &timer_driver,
},
}; };
static int __init init_timer_devicefs(void) static int __init init_timer_sysfs(void)
{ {
driver_register(&timer_driver); int error = sysdev_class_register(&timer_sysclass);
return sys_device_register(&device_timer); if (!error)
error = sys_device_register(&device_timer);
return error;
} }
device_initcall(init_timer_devicefs); device_initcall(init_timer_sysfs);
void __init init_IRQ(void) void __init init_IRQ(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment