diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-16 15:23:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:44:32 -0500 |
commit | 2831fe6f9cc4e16c103504ee09a47a084297c0f3 (patch) | |
tree | 36869b2a4ad9dce0fb0812f44355233e907afa95 /drivers/base/core.c | |
parent | 2e5ba26a483218b51b7b327fb235b348890aea15 (diff) |
driver core: create a private portion of struct device
This is to be used to move things out of struct device that no code
outside of the driver core should ever touch.
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, 8 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 14aa2b6953c9..6657787e64f8 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -109,6 +109,7 @@ 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; | ||
112 | 113 | ||
113 | if (dev->release) | 114 | if (dev->release) |
114 | dev->release(dev); | 115 | dev->release(dev); |
@@ -120,6 +121,7 @@ static void device_release(struct kobject *kobj) | |||
120 | WARN(1, KERN_ERR "Device '%s' does not have a release() " | 121 | WARN(1, KERN_ERR "Device '%s' does not have a release() " |
121 | "function, it is broken and must be fixed.\n", | 122 | "function, it is broken and must be fixed.\n", |
122 | dev_name(dev)); | 123 | dev_name(dev)); |
124 | kfree(p); | ||
123 | } | 125 | } |
124 | 126 | ||
125 | static struct kobj_type device_ktype = { | 127 | static struct kobj_type device_ktype = { |
@@ -536,6 +538,12 @@ static void klist_children_put(struct klist_node *n) | |||
536 | */ | 538 | */ |
537 | void device_initialize(struct device *dev) | 539 | void device_initialize(struct device *dev) |
538 | { | 540 | { |
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; | ||
539 | dev->kobj.kset = devices_kset; | 547 | dev->kobj.kset = devices_kset; |
540 | kobject_init(&dev->kobj, &device_ktype); | 548 | kobject_init(&dev->kobj, &device_ktype); |
541 | klist_init(&dev->klist_children, klist_children_get, | 549 | klist_init(&dev->klist_children, klist_children_get, |