aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/base.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-09 17:32:46 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-09 17:32:46 -0500
commit4db8e282f2d1dfa43d51ce2a4817901312c9134d (patch)
treec2d2ee15e5d74186ad79220035b222df7c8330c5 /drivers/base/base.h
parent73d59314e6ed268d6f322ae1bdd723b23fa5a4ed (diff)
Revert "driver core: move knode_bus into private structure"
This reverts commit b9daa99ee533578e3f88231e7a16784dcb44ec42. 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 b676f8f801f8..8af0bb2c0aa8 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -69,7 +69,6 @@ struct class_private {
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 71 * @knode_driver - node in driver list
72 * @knode_bus - node in bus list
73 * @device - pointer back to the struct class that this structure is 72 * @device - pointer back to the struct class that this structure is
74 * associated with. 73 * associated with.
75 * 74 *
@@ -79,15 +78,12 @@ struct device_private {
79 struct klist klist_children; 78 struct klist klist_children;
80 struct klist_node knode_parent; 79 struct klist_node knode_parent;
81 struct klist_node knode_driver; 80 struct klist_node knode_driver;
82 struct klist_node knode_bus;
83 struct device *device; 81 struct device *device;
84}; 82};
85#define to_device_private_parent(obj) \ 83#define to_device_private_parent(obj) \
86 container_of(obj, struct device_private, knode_parent) 84 container_of(obj, struct device_private, knode_parent)
87#define to_device_private_driver(obj) \ 85#define to_device_private_driver(obj) \
88 container_of(obj, struct device_private, knode_driver) 86 container_of(obj, struct device_private, knode_driver)
89#define to_device_private_bus(obj) \
90 container_of(obj, struct device_private, knode_bus)
91 87
92/* initialisation functions */ 88/* initialisation functions */
93extern int devices_init(void); 89extern int devices_init(void);