diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2007-03-13 22:25:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-04-27 13:57:28 -0400 |
commit | 864062457a2e444227bd368ca5f2a2b740de604f (patch) | |
tree | 38e516852ee9825b5ffe0b1f2e8abea0a88b1674 /include | |
parent | 00ed8e3dda47f8421b11da17e353d7db8c878121 (diff) |
driver core: fix namespace issue with devices assigned to classes
- uses a kset in "struct class" to keep track of all directories
belonging to this class
- merges with the /sys/devices/virtual logic.
- removes the namespace-dir if the last member of that class
leaves the directory.
There may be locking or refcounting fixes left, I stopped when it seemed
to work with network and sound modules. :)
From: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/device.h | 3 | ||||
-rw-r--r-- | include/linux/kobject.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 5cf30e95c8b6..de0e73eae6bc 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -181,10 +181,9 @@ struct class { | |||
181 | struct list_head children; | 181 | struct list_head children; |
182 | struct list_head devices; | 182 | struct list_head devices; |
183 | struct list_head interfaces; | 183 | struct list_head interfaces; |
184 | struct kset class_dirs; | ||
184 | struct semaphore sem; /* locks both the children and interfaces lists */ | 185 | struct semaphore sem; /* locks both the children and interfaces lists */ |
185 | 186 | ||
186 | struct kobject *virtual_dir; | ||
187 | |||
188 | struct class_attribute * class_attrs; | 187 | struct class_attribute * class_attrs; |
189 | struct class_device_attribute * class_dev_attrs; | 188 | struct class_device_attribute * class_dev_attrs; |
190 | struct device_attribute * dev_attrs; | 189 | struct device_attribute * dev_attrs; |
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index b850e0310538..d37cd7f10e3d 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
@@ -89,6 +89,8 @@ extern void kobject_unregister(struct kobject *); | |||
89 | extern struct kobject * kobject_get(struct kobject *); | 89 | extern struct kobject * kobject_get(struct kobject *); |
90 | extern void kobject_put(struct kobject *); | 90 | extern void kobject_put(struct kobject *); |
91 | 91 | ||
92 | extern struct kobject *kobject_kset_add_dir(struct kset *kset, | ||
93 | struct kobject *, const char *); | ||
92 | extern struct kobject *kobject_add_dir(struct kobject *, const char *); | 94 | extern struct kobject *kobject_add_dir(struct kobject *, const char *); |
93 | 95 | ||
94 | extern char * kobject_get_path(struct kobject *, gfp_t); | 96 | extern char * kobject_get_path(struct kobject *, gfp_t); |