1 files changed, 15 insertions, 14 deletions

diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 8b7a141ff35e..e85512dd9c72 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -25,7 +25,7 @@
 #include <linux/stat.h>
 #include <linux/interrupt.h>
 #include <linux/sh_intc.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
@@ -434,46 +434,47 @@ struct syscore_ops intc_syscore_ops = {
         .resume         = intc_resume,
 };
 
-struct sysdev_class intc_sysdev_class = {
+struct bus_type intc_subsys = {
         .name           = "intc",
+        .dev_name       = "intc",
 };
 
 static ssize_t
-show_intc_name(struct sys_device *dev, struct sysdev_attribute *attr, char *buf)
+show_intc_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct intc_desc_int *d;
 
-        d = container_of(dev, struct intc_desc_int, sysdev);
+        d = container_of(dev, struct intc_desc_int, dev);
 
         return sprintf(buf, "%s\n", d->chip.name);
 }
 
-static SYSDEV_ATTR(name, S_IRUGO, show_intc_name, NULL);
+static DEVICE_ATTR(name, S_IRUGO, show_intc_name, NULL);
 
-static int __init register_intc_sysdevs(void)
+static int __init register_intc_devs(void)
 {
         struct intc_desc_int *d;
         int error;
 
         register_syscore_ops(&intc_syscore_ops);
 
-        error = sysdev_class_register(&intc_sysdev_class);
+        error = subsys_system_register(&intc_subsys, NULL);
         if (!error) {
                 list_for_each_entry(d, &intc_list, list) {
-                        d->sysdev.id = d->index;
-                        d->sysdev.cls = &intc_sysdev_class;
-                        error = sysdev_register(&d->sysdev);
+                        d->dev.id = d->index;
+                        d->dev.bus = &intc_subsys;
+                        error = device_register(&d->dev);
                         if (error == 0)
-                                error = sysdev_create_file(&d->sysdev,
-                                                           &attr_name);
+                                error = device_create_file(&d->dev,
+                                                           &dev_attr_name);
                         if (error)
                                 break;
                 }
         }
 
         if (error)
-                pr_err("sysdev registration error\n");
+                pr_err("device registration error\n");
 
         return error;
 }
-device_initcall(register_intc_sysdevs);
+device_initcall(register_intc_devs);