kset: convert /sys/devices to use kset_create
Greg Kroah-Hartman [Thu, 1 Nov 2007 15:29:06 +0000 (09:29 -0600)]
Dynamically create the kset instead of declaring it statically.  We also
rename devices_subsys to devices_kset to catch all users of the
variable.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/base/base.h
drivers/base/core.c
drivers/base/power/shutdown.c
drivers/base/sys.c

index 10b2fb6..7e309a4 100644 (file)
@@ -44,4 +44,4 @@ extern char *make_class_name(const char *name, struct kobject *kobj);
 
 extern int devres_release_all(struct device *dev);
 
-extern struct kset devices_subsys;
+extern struct kset *devices_kset;
index 7762ee8..d2de2d5 100644 (file)
@@ -401,11 +401,8 @@ static ssize_t show_dev(struct device *dev, struct device_attribute *attr,
 static struct device_attribute devt_attr =
        __ATTR(dev, S_IRUGO, show_dev, NULL);
 
-/*
- *     devices_subsys - structure to be registered with kobject core.
- */
-
-decl_subsys(devices, &device_uevent_ops);
+/* kset to create /sys/devices/  */
+struct kset *devices_kset;
 
 
 /**
@@ -525,7 +522,7 @@ static void klist_children_put(struct klist_node *n)
 
 void device_initialize(struct device *dev)
 {
-       dev->kobj.kset = &devices_subsys;
+       dev->kobj.kset = devices_kset;
        dev->kobj.ktype = &device_ktype;
        kobject_init(&dev->kobj);
        klist_init(&dev->klist_children, klist_children_get,
@@ -563,7 +560,7 @@ static struct kobject *virtual_device_parent(struct device *dev)
 
        if (!virtual_dir)
                virtual_dir = kobject_create_and_add("virtual",
-                                                    &devices_subsys.kobj);
+                                                    &devices_kset->kobj);
 
        return virtual_dir;
 }
@@ -1097,7 +1094,10 @@ struct device * device_find_child(struct device *parent, void *data,
 
 int __init devices_init(void)
 {
-       return subsystem_register(&devices_subsys);
+       devices_kset = kset_create_and_add("devices", &device_uevent_ops, NULL);
+       if (!devices_kset)
+               return -ENOMEM;
+       return 0;
 }
 
 EXPORT_SYMBOL_GPL(device_for_each_child);
index 56e8eaa..f51cbc1 100644 (file)
@@ -34,7 +34,7 @@ void device_shutdown(void)
 {
        struct device * dev, *devn;
 
-       list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.list,
+       list_for_each_entry_safe_reverse(dev, devn, &devices_kset->list,
                                kobj.entry) {
                if (dev->bus && dev->bus->shutdown) {
                        dev_dbg(dev, "shutdown\n");
index 7cf19fc..7693c95 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "base.h"
 
-extern struct kset devices_subsys;
-
 #define to_sysdev(k) container_of(k, struct sys_device, kobj)
 #define to_sysdev_attr(a) container_of(a, struct sysdev_attribute, attr)
 
@@ -459,7 +457,7 @@ int sysdev_resume(void)
 
 int __init system_bus_init(void)
 {
-       system_subsys.kobj.parent = &devices_subsys.kobj;
+       system_subsys.kobj.parent = &devices_kset->kobj;
        return subsystem_register(&system_subsys);
 }