diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2007-09-14 07:25:19 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 17:51:02 -0400 |
commit | d716551e188787effb08bf87a846404cfd239a8b (patch) | |
tree | 4e36beacb0d0bb38c59367dd4a9cd1a616b040c8 | |
parent | ce2c9cb0259acd2aed184499ebe41ab00da13b25 (diff) |
Driver core: clean up removed functions from the documentation
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | Documentation/kobject.txt | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index 8ee49ee7c963..5e7aca261359 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt | |||
@@ -54,7 +54,6 @@ embedded in larger data structures and replace fields they duplicate. | |||
54 | 54 | ||
55 | struct kobject { | 55 | struct kobject { |
56 | const char * k_name; | 56 | const char * k_name; |
57 | char name[KOBJ_NAME_LEN]; | ||
58 | struct kref kref; | 57 | struct kref kref; |
59 | struct list_head entry; | 58 | struct list_head entry; |
60 | struct kobject * parent; | 59 | struct kobject * parent; |
@@ -223,18 +222,15 @@ decl_subsys(devices, &ktype_device, &device_uevent_ops); | |||
223 | is equivalent to doing: | 222 | is equivalent to doing: |
224 | 223 | ||
225 | struct kset devices_subsys = { | 224 | struct kset devices_subsys = { |
226 | .kobj = { | ||
227 | .name = "devices", | ||
228 | }, | ||
229 | .ktype = &ktype_devices, | 225 | .ktype = &ktype_devices, |
230 | .uevent_ops = &device_uevent_ops, | 226 | .uevent_ops = &device_uevent_ops, |
231 | }; | 227 | }; |
232 | 228 | kobject_set_name(&devices_subsys, name); | |
233 | 229 | ||
234 | The objects that are registered with a subsystem that use the | 230 | The objects that are registered with a subsystem that use the |
235 | subsystem's default list must have their kset ptr set properly. These | 231 | subsystem's default list must have their kset ptr set properly. These |
236 | objects may have embedded kobjects or ksets. The | 232 | objects may have embedded kobjects or ksets. The |
237 | following helpers make setting the kset easier: | 233 | following helper makes setting the kset easier: |
238 | 234 | ||
239 | 235 | ||
240 | kobj_set_kset_s(obj,subsys) | 236 | kobj_set_kset_s(obj,subsys) |
@@ -242,22 +238,9 @@ kobj_set_kset_s(obj,subsys) | |||
242 | - Assumes that obj->kobj exists, and is a struct kobject. | 238 | - Assumes that obj->kobj exists, and is a struct kobject. |
243 | - Sets the kset of that kobject to the kset <subsys>. | 239 | - Sets the kset of that kobject to the kset <subsys>. |
244 | 240 | ||
245 | |||
246 | kset_set_kset_s(obj,subsys) | ||
247 | |||
248 | - Assumes that obj->kset exists, and is a struct kset. | ||
249 | - Sets the kset of the embedded kobject to the kset <subsys>. | ||
250 | |||
251 | subsys_set_kset(obj,subsys) | ||
252 | |||
253 | - Assumes obj->subsys exists, and is a struct subsystem. | ||
254 | - Sets obj->subsys.kset.kobj.kset to the subsystem's embedded kset. | ||
255 | |||
256 | void subsystem_init(struct kset *s); | 241 | void subsystem_init(struct kset *s); |
257 | int subsystem_register(struct kset *s); | 242 | int subsystem_register(struct kset *s); |
258 | void subsystem_unregister(struct kset *s); | 243 | void subsystem_unregister(struct kset *s); |
259 | struct kset *subsys_get(struct kset *s); | ||
260 | void kset_put(struct kset *s); | ||
261 | 244 | ||
262 | These are just wrappers around the respective kset_* functions. | 245 | These are just wrappers around the respective kset_* functions. |
263 | 246 | ||