Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest

Conflicts:
	arch/arm/mach-shmobile/clock-sh73a0.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 13 insertions, 11 deletions

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index f0907995b4c..a8140f0bbf6 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/cpu.h>
 #include <linux/bitmap.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -337,9 +337,9 @@ static struct kobj_type ktype_percpu_entry = {
         .default_attrs  = sq_sysfs_attrs,
 };
 
-static int __devinit sq_sysdev_add(struct sys_device *sysdev)
+static int __devinit sq_dev_add(struct device *dev)
 {
-        unsigned int cpu = sysdev->id;
+        unsigned int cpu = dev->id;
         struct kobject *kobj;
         int error;
 
@@ -348,25 +348,27 @@ static int __devinit sq_sysdev_add(struct sys_device *sysdev)
                 return -ENOMEM;
 
         kobj = sq_kobject[cpu];
-        error = kobject_init_and_add(kobj, &ktype_percpu_entry, &sysdev->kobj,
+        error = kobject_init_and_add(kobj, &ktype_percpu_entry, &dev->kobj,
                                      "%s", "sq");
         if (!error)
                 kobject_uevent(kobj, KOBJ_ADD);
         return error;
 }
 
-static int __devexit sq_sysdev_remove(struct sys_device *sysdev)
+static int __devexit sq_dev_remove(struct device *dev)
 {
-        unsigned int cpu = sysdev->id;
+        unsigned int cpu = dev->id;
         struct kobject *kobj = sq_kobject[cpu];
 
         kobject_put(kobj);
         return 0;
 }
 
-static struct sysdev_driver sq_sysdev_driver = {
-        .add            = sq_sysdev_add,
-        .remove         = __devexit_p(sq_sysdev_remove),
+static struct subsys_interface sq_interface = {
+        .name           = "sq"
+        .subsys         = &cpu_subsys,
+        .add_dev        = sq_dev_add,
+        .remove_dev     = __devexit_p(sq_dev_remove),
 };
 
 static int __init sq_api_init(void)
@@ -386,7 +388,7 @@ static int __init sq_api_init(void)
         if (unlikely(!sq_bitmap))
                 goto out;
 
-        ret = sysdev_driver_register(&cpu_sysdev_class, &sq_sysdev_driver);
+        ret = subsys_interface_register(&sq_interface);
         if (unlikely(ret != 0))
                 goto out;
 
@@ -401,7 +403,7 @@ out:
 
 static void __exit sq_api_exit(void)
 {
-        sysdev_driver_unregister(&cpu_sysdev_class, &sq_sysdev_driver);
+        subsys_interface_unregister(&sq_interface);
         kfree(sq_bitmap);
         kmem_cache_destroy(sq_cache);
 }