aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/base.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-09 17:44:18 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-09 17:44:18 -0500
commitcda5e83fdea476dce9c0a9b1152cd6ca46832cc4 (patch)
tree38095e8b88c8c163cb8b61e8f071d444752fad6b /drivers/base/base.h
parent4db8e282f2d1dfa43d51ce2a4817901312c9134d (diff)
Revert "driver core: move knode_driver into private structure"
This reverts commit 93e746db183b3bdbbda67900f79b5835f9cb388f. 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.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h
index 8af0bb2c0aa8..f5cf31c664d7 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -68,7 +68,6 @@ struct class_private {
68 * 68 *
69 * @klist_children - klist containing all children of this device 69 * @klist_children - klist containing all children of this device
70 * @knode_parent - node in sibling list 70 * @knode_parent - node in sibling list
71 * @knode_driver - node in driver list
72 * @device - pointer back to the struct class that this structure is 71 * @device - pointer back to the struct class that this structure is
73 * associated with. 72 * associated with.
74 * 73 *
@@ -77,13 +76,10 @@ struct class_private {
77struct device_private { 76struct device_private {
78 struct klist klist_children; 77 struct klist klist_children;
79 struct klist_node knode_parent; 78 struct klist_node knode_parent;
80 struct klist_node knode_driver;
81 struct device *device; 79 struct device *device;
82}; 80};
83#define to_device_private_parent(obj) \ 81#define to_device_private_parent(obj) \
84 container_of(obj, struct device_private, knode_parent) 82 container_of(obj, struct device_private, knode_parent)
85#define to_device_private_driver(obj) \
86 container_of(obj, struct device_private, knode_driver)
87 83
88/* initialisation functions */ 84/* initialisation functions */
89extern int devices_init(void); 85extern int devices_init(void);