aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-09 18:06:12 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-09 18:06:12 -0500
commit926beadb3dfaddccb3348a5b9e6c2a1f8290a220 (patch)
tree97e2005e61e33635315eb7cfc991a8952a4d38f0
parente2d4077678c7ec7661003c268120582adc544897 (diff)
Revert "driver core: create a private portion of struct device"
This reverts commit 2831fe6f9cc4e16c103504ee09a47a084297c0f3. 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>
-rw-r--r--drivers/base/base.h12
-rw-r--r--drivers/base/core.c8
-rw-r--r--include/linux/device.h3
3 files changed, 0 insertions, 23 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h
index 6b20809b5fd4..0a5f055dffba 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -63,18 +63,6 @@ struct class_private {
63#define to_class(obj) \ 63#define to_class(obj) \
64 container_of(obj, struct class_private, class_subsys.kobj) 64 container_of(obj, struct class_private, class_subsys.kobj)
65 65
66/**
67 * struct device_private - structure to hold the private to the driver core portions of the device structure.
68 *
69 * @device - pointer back to the struct class that this structure is
70 * associated with.
71 *
72 * Nothing outside of the driver core should ever touch these fields.
73 */
74struct device_private {
75 struct device *device;
76};
77
78/* initialisation functions */ 66/* initialisation functions */
79extern int devices_init(void); 67extern int devices_init(void);
80extern int buses_init(void); 68extern int buses_init(void);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 5c2acf7116d7..8079afca4972 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -109,7 +109,6 @@ static struct sysfs_ops dev_sysfs_ops = {
109static void device_release(struct kobject *kobj) 109static void device_release(struct kobject *kobj)
110{ 110{
111 struct device *dev = to_dev(kobj); 111 struct device *dev = to_dev(kobj);
112 struct device_private *p = dev->p;
113 112
114 if (dev->release) 113 if (dev->release)
115 dev->release(dev); 114 dev->release(dev);
@@ -121,7 +120,6 @@ static void device_release(struct kobject *kobj)
121 WARN(1, KERN_ERR "Device '%s' does not have a release() " 120 WARN(1, KERN_ERR "Device '%s' does not have a release() "
122 "function, it is broken and must be fixed.\n", 121 "function, it is broken and must be fixed.\n",
123 dev_name(dev)); 122 dev_name(dev));
124 kfree(p);
125} 123}
126 124
127static struct kobj_type device_ktype = { 125static struct kobj_type device_ktype = {
@@ -538,12 +536,6 @@ static void klist_children_put(struct klist_node *n)
538 */ 536 */
539void device_initialize(struct device *dev) 537void device_initialize(struct device *dev)
540{ 538{
541 dev->p = kzalloc(sizeof(*dev->p), GFP_KERNEL);
542 if (!dev->p) {
543 WARN_ON(1);
544 return;
545 }
546 dev->p->device = dev;
547 dev->kobj.kset = devices_kset; 539 dev->kobj.kset = devices_kset;
548 kobject_init(&dev->kobj, &device_ktype); 540 kobject_init(&dev->kobj, &device_ktype);
549 klist_init(&dev->klist_children, klist_children_get, 541 klist_init(&dev->klist_children, klist_children_get,
diff --git a/include/linux/device.h b/include/linux/device.h
index 2975351635d3..45e5b1921fbb 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -28,7 +28,6 @@
28#define BUS_ID_SIZE 20 28#define BUS_ID_SIZE 20
29 29
30struct device; 30struct device;
31struct device_private;
32struct device_driver; 31struct device_driver;
33struct driver_private; 32struct driver_private;
34struct class; 33struct class;
@@ -372,8 +371,6 @@ struct device {
372 struct klist_node knode_bus; 371 struct klist_node knode_bus;
373 struct device *parent; 372 struct device *parent;
374 373
375 struct device_private *p;
376
377 struct kobject kobj; 374 struct kobject kobj;
378 char bus_id[BUS_ID_SIZE]; /* position on parent bus */ 375 char bus_id[BUS_ID_SIZE]; /* position on parent bus */
379 unsigned uevent_suppress:1; 376 unsigned uevent_suppress:1;