edac: 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: Doug Thompson <dougthompson@xmission.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c
index 73c3e26a0bce..885e8ad8fdcf 100644
--- a/drivers/edac/mce_amd_inj.c
+++ b/drivers/edac/mce_amd_inj.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/kobject.h>
-#include <linux/sysdev.h>
 #include <linux/edac.h>
 #include <linux/module.h>
 #include <asm/mce.h>
@@ -116,14 +115,14 @@ static struct edac_mce_attr *sysfs_attrs[] = { &mce_attr_status, &mce_attr_misc,
 
 static int __init edac_init_mce_inject(void)
 {
-        struct sysdev_class *edac_class = NULL;
+        struct bus_type *edac_subsys = NULL;
         int i, err = 0;
 
-        edac_class = edac_get_sysfs_class();
-        if (!edac_class)
+        edac_subsys = edac_get_sysfs_subsys();
+        if (!edac_subsys)
                 return -EINVAL;
 
-        mce_kobj = kobject_create_and_add("mce", &edac_class->kset.kobj);
+        mce_kobj = kobject_create_and_add("mce", &edac_subsys->dev_root->kobj);
         if (!mce_kobj) {
                 printk(KERN_ERR "Error creating a mce kset.\n");
                 err = -ENOMEM;
@@ -147,7 +146,7 @@ err_sysfs_create:
         kobject_del(mce_kobj);
 
 err_mce_kobj:
-        edac_put_sysfs_class();
+        edac_put_sysfs_subsys();
 
         return err;
 }
@@ -161,7 +160,7 @@ static void __exit edac_exit_mce_inject(void)
 
         kobject_del(mce_kobj);
 
-        edac_put_sysfs_class();
+        edac_put_sysfs_subsys();
 }
 
 module_init(edac_init_mce_inject);