aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-08 01:19:37 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-09-26 00:08:38 -0400
commitc205ef4880273d2de4ee5388d4e52227ff688cc4 (patch)
tree78e7cde849b9c40fd323b5550a8e64d5d169c55f /drivers
parenta2de48cace5d0993da6cfa28b276ae724dc3569b (diff)
Driver core: create devices/virtual/ tree
This change creates a devices/virtual/CLASS_NAME tree for struct devices that belong to a class, yet do not have a "real" struct device for a parent. It automatically creates the directories on the fly as needed. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/class.c17
-rw-r--r--drivers/base/core.c7
2 files changed, 24 insertions, 0 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c
index e078bc21d52e..cbdf47c0c60d 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -19,6 +19,8 @@
19#include <linux/slab.h> 19#include <linux/slab.h>
20#include "base.h" 20#include "base.h"
21 21
22extern struct subsystem devices_subsys;
23
22#define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr) 24#define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
23#define to_class(obj) container_of(obj, struct class, subsys.kset.kobj) 25#define to_class(obj) container_of(obj, struct class, subsys.kset.kobj)
24 26
@@ -878,7 +880,22 @@ void class_interface_unregister(struct class_interface *class_intf)
878 class_put(parent); 880 class_put(parent);
879} 881}
880 882
883int virtual_device_parent(struct device *dev)
884{
885 if (!dev->class)
886 return -ENODEV;
887
888 if (!dev->class->virtual_dir) {
889 static struct kobject *virtual_dir = NULL;
881 890
891 if (!virtual_dir)
892 virtual_dir = kobject_add_dir(&devices_subsys.kset.kobj, "virtual");
893 dev->class->virtual_dir = kobject_add_dir(virtual_dir, dev->class->name);
894 }
895
896 dev->kobj.parent = dev->class->virtual_dir;
897 return 0;
898}
882 899
883int __init classes_init(void) 900int __init classes_init(void)
884{ 901{
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 0db47561331e..e21a65fc043e 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -378,6 +378,13 @@ int device_add(struct device *dev)
378 if (!dev || !strlen(dev->bus_id)) 378 if (!dev || !strlen(dev->bus_id))
379 goto Error; 379 goto Error;
380 380
381 /* if this is a class device, and has no parent, create one */
382 if ((dev->class) && (dev->parent == NULL)) {
383 error = virtual_device_parent(dev);
384 if (error)
385 goto Error;
386 }
387
381 parent = get_device(dev->parent); 388 parent = get_device(dev->parent);
382 389
383 pr_debug("DEV: registering device: ID = '%s'\n", dev->bus_id); 390 pr_debug("DEV: registering device: ID = '%s'\n", dev->bus_id);