diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-09 17:55:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-09 17:55:37 -0500 |
commit | e2d4077678c7ec7661003c268120582adc544897 (patch) | |
tree | 73397637de1d8274ae3f908a9534634afc9ea903 /drivers/base/base.h | |
parent | cda5e83fdea476dce9c0a9b1152cd6ca46832cc4 (diff) |
Revert "driver core: move klist_children into private structure"
This reverts commit 11c3b5c3e08f4d855cbef52883c266b9ab9df879.
Turns out that device_initialize shouldn't fail silently.
This series needs to be reworked in order to get into proper
shape.
Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/base.h')
-rw-r--r-- | drivers/base/base.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h index f5cf31c664d7..6b20809b5fd4 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h | |||
@@ -66,20 +66,14 @@ struct class_private { | |||
66 | /** | 66 | /** |
67 | * struct device_private - structure to hold the private to the driver core portions of the device structure. | 67 | * struct device_private - structure to hold the private to the driver core portions of the device structure. |
68 | * | 68 | * |
69 | * @klist_children - klist containing all children of this device | ||
70 | * @knode_parent - node in sibling list | ||
71 | * @device - pointer back to the struct class that this structure is | 69 | * @device - pointer back to the struct class that this structure is |
72 | * associated with. | 70 | * associated with. |
73 | * | 71 | * |
74 | * Nothing outside of the driver core should ever touch these fields. | 72 | * Nothing outside of the driver core should ever touch these fields. |
75 | */ | 73 | */ |
76 | struct device_private { | 74 | struct device_private { |
77 | struct klist klist_children; | ||
78 | struct klist_node knode_parent; | ||
79 | struct device *device; | 75 | struct device *device; |
80 | }; | 76 | }; |
81 | #define to_device_private_parent(obj) \ | ||
82 | container_of(obj, struct device_private, knode_parent) | ||
83 | 77 | ||
84 | /* initialisation functions */ | 78 | /* initialisation functions */ |
85 | extern int devices_init(void); | 79 | extern int devices_init(void); |