power: qe_ic - 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: Timur Tabi <timur@freescale.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 18e75ca19fe688d7e1eb6c321bce98d7214a8d38..73034bd203c499b88022e34d549e823769134507 100644 (file)
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -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;