diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-09 18:06:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-09 18:06:12 -0500 |
commit | 926beadb3dfaddccb3348a5b9e6c2a1f8290a220 (patch) | |
tree | 97e2005e61e33635315eb7cfc991a8952a4d38f0 /drivers/base/core.c | |
parent | e2d4077678c7ec7661003c268120582adc544897 (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>
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r-- | drivers/base/core.c | 8 |
1 files changed, 0 insertions, 8 deletions
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 = { | |||
109 | static void device_release(struct kobject *kobj) | 109 | static 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 | ||
127 | static struct kobj_type device_ktype = { | 125 | static struct kobj_type device_ktype = { |
@@ -538,12 +536,6 @@ static void klist_children_put(struct klist_node *n) | |||
538 | */ | 536 | */ |
539 | void device_initialize(struct device *dev) | 537 | void 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, |