cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem

This moves the 'cpu sysdev_class' over to a regular 'cpu' subsystem
and converts the devices to regular devices. The sysdev drivers are
implemented as subsystem interfaces now.

After all sysdev classes are ported to regular driver core entities, the
sysdev implementation will be entirely removed from the kernel.

Userspace relies on events and generic sysfs subsystem infrastructure
from sysdev devices, which are made available with this conversion.

Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Borislav Petkov <bp@amd64.org>
Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
Cc: Len Brown <lenb@kernel.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 31 insertions, 30 deletions

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 3675da73623..1708fb7aba3 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -522,31 +522,32 @@ void spu_init_channels(struct spu *spu)
 }
 EXPORT_SYMBOL_GPL(spu_init_channels);
 
-static struct sysdev_class spu_sysdev_class = {
+static struct bus_type spu_subsys = {
         .name = "spu",
+        .dev_name = "spu",
 };
 
-int spu_add_sysdev_attr(struct sysdev_attribute *attr)
+int spu_add_dev_attr(struct device_attribute *attr)
 {
         struct spu *spu;
 
         mutex_lock(&spu_full_list_mutex);
         list_for_each_entry(spu, &spu_full_list, full_list)
-                sysdev_create_file(&spu->sysdev, attr);
+                device_create_file(&spu->dev, attr);
         mutex_unlock(&spu_full_list_mutex);
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(spu_add_sysdev_attr);
+EXPORT_SYMBOL_GPL(spu_add_dev_attr);
 
-int spu_add_sysdev_attr_group(struct attribute_group *attrs)
+int spu_add_dev_attr_group(struct attribute_group *attrs)
 {
         struct spu *spu;
         int rc = 0;
 
         mutex_lock(&spu_full_list_mutex);
         list_for_each_entry(spu, &spu_full_list, full_list) {
-                rc = sysfs_create_group(&spu->sysdev.kobj, attrs);
+                rc = sysfs_create_group(&spu->dev.kobj, attrs);
 
                 /* we're in trouble here, but try unwinding anyway */
                 if (rc) {
@@ -555,7 +556,7 @@ int spu_add_sysdev_attr_group(struct attribute_group *attrs)
 
                         list_for_each_entry_continue_reverse(spu,
                                         &spu_full_list, full_list)
-                                sysfs_remove_group(&spu->sysdev.kobj, attrs);
+                                sysfs_remove_group(&spu->dev.kobj, attrs);
                         break;
                 }
         }
@@ -564,45 +565,45 @@ int spu_add_sysdev_attr_group(struct attribute_group *attrs)
 
         return rc;
 }
-EXPORT_SYMBOL_GPL(spu_add_sysdev_attr_group);
+EXPORT_SYMBOL_GPL(spu_add_dev_attr_group);
 
 
-void spu_remove_sysdev_attr(struct sysdev_attribute *attr)
+void spu_remove_dev_attr(struct device_attribute *attr)
 {
         struct spu *spu;
 
         mutex_lock(&spu_full_list_mutex);
         list_for_each_entry(spu, &spu_full_list, full_list)
-                sysdev_remove_file(&spu->sysdev, attr);
+                device_remove_file(&spu->dev, attr);
         mutex_unlock(&spu_full_list_mutex);
 }
-EXPORT_SYMBOL_GPL(spu_remove_sysdev_attr);
+EXPORT_SYMBOL_GPL(spu_remove_dev_attr);
 
-void spu_remove_sysdev_attr_group(struct attribute_group *attrs)
+void spu_remove_dev_attr_group(struct attribute_group *attrs)
 {
         struct spu *spu;
 
         mutex_lock(&spu_full_list_mutex);
         list_for_each_entry(spu, &spu_full_list, full_list)
-                sysfs_remove_group(&spu->sysdev.kobj, attrs);
+                sysfs_remove_group(&spu->dev.kobj, attrs);
         mutex_unlock(&spu_full_list_mutex);
 }
-EXPORT_SYMBOL_GPL(spu_remove_sysdev_attr_group);
+EXPORT_SYMBOL_GPL(spu_remove_dev_attr_group);
 
-static int spu_create_sysdev(struct spu *spu)
+static int spu_create_dev(struct spu *spu)
 {
         int ret;
 
-        spu->sysdev.id = spu->number;
-        spu->sysdev.cls = &spu_sysdev_class;
-        ret = sysdev_register(&spu->sysdev);
+        spu->dev.id = spu->number;
+        spu->dev.bus = &spu_subsys;
+        ret = device_register(&spu->dev);
         if (ret) {
                 printk(KERN_ERR "Can't register SPU %d with sysfs\n",
                                 spu->number);
                 return ret;
         }
 
-        sysfs_add_device_to_node(&spu->sysdev, spu->node);
+        sysfs_add_device_to_node(&spu->dev, spu->node);
 
         return 0;
 }
@@ -638,7 +639,7 @@ static int __init create_spu(void *data)
         if (ret)
                 goto out_destroy;
 
-        ret = spu_create_sysdev(spu);
+        ret = spu_create_dev(spu);
         if (ret)
                 goto out_free_irqs;
 
@@ -695,10 +696,10 @@ static unsigned long long spu_acct_time(struct spu *spu,
 }
 
 
-static ssize_t spu_stat_show(struct sys_device *sysdev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t spu_stat_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
-        struct spu *spu = container_of(sysdev, struct spu, sysdev);
+        struct spu *spu = container_of(dev, struct spu, dev);
 
         return sprintf(buf, "%s %llu %llu %llu %llu "
                       "%llu %llu %llu %llu %llu %llu %llu %llu\n",
@@ -717,7 +718,7 @@ static ssize_t spu_stat_show(struct sys_device *sysdev,
                 spu->stats.libassist);
 }
 
-static SYSDEV_ATTR(stat, 0644, spu_stat_show, NULL);
+static DEVICE_ATTR(stat, 0644, spu_stat_show, NULL);
 
 #ifdef CONFIG_KEXEC
 
@@ -816,8 +817,8 @@ static int __init init_spu_base(void)
         if (!spu_management_ops)
                 goto out;
 
-        /* create sysdev class for spus */
-        ret = sysdev_class_register(&spu_sysdev_class);
+        /* create system subsystem for spus */
+        ret = subsys_system_register(&spu_subsys, NULL);
         if (ret)
                 goto out;
 
@@ -826,7 +827,7 @@ static int __init init_spu_base(void)
         if (ret < 0) {
                 printk(KERN_WARNING "%s: Error initializing spus\n",
                         __func__);
-                goto out_unregister_sysdev_class;
+                goto out_unregister_subsys;
         }
 
         if (ret > 0)
@@ -836,15 +837,15 @@ static int __init init_spu_base(void)
         xmon_register_spus(&spu_full_list);
         crash_register_spus(&spu_full_list);
         mutex_unlock(&spu_full_list_mutex);
-        spu_add_sysdev_attr(&attr_stat);
+        spu_add_dev_attr(&dev_attr_stat);
         register_syscore_ops(&spu_syscore_ops);
 
         spu_init_affinity();
 
         return 0;
 
- out_unregister_sysdev_class:
-        sysdev_class_unregister(&spu_sysdev_class);
+ out_unregister_subsys:
+        bus_unregister(&spu_subsys);
  out:
         return ret;
 }