kobject: convert /sys/hypervisor to use kobject_create

[linux-2.6] / drivers / base / firmware.c

diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index 90c8629321698b8a697d84b47f04eb67ded96b89..6a4e494042f6269aacf51baa31fe1a5a25858080 100644 (file)
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -15,11 +15,12 @@
 
 #include "base.h"
 
-static decl_subsys(firmware, NULL, NULL);
+static struct kset *firmware_kset;
 
 int firmware_register(struct kset *s)
 {
-       kobj_set_kset_s(s, firmware_subsys);
+       s->kobj.kset = firmware_kset;
+       s->kobj.ktype = NULL;
        return subsystem_register(s);
 }
 
@@ -30,7 +31,10 @@ void firmware_unregister(struct kset *s)
 
 int __init firmware_init(void)
 {
-       return subsystem_register(&firmware_subsys);
+       firmware_kset = kset_create_and_add("firmware", NULL, NULL);
+       if (!firmware_kset)
+               return -ENOMEM;
+       return 0;
 }
 
 EXPORT_SYMBOL_GPL(firmware_register);