|
@@ -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;
|