aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/core.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-12-16 15:23:36 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-24 19:38:25 -0400
commitfb069a5d132fb926ed17af3211a114ac7cf27d7a (patch)
treec104d9df7c83c27e3785265fb7412fd9332bc10a /drivers/base/core.c
parentb23530ebc339c4092ae2c9f37341a5398fea8b89 (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.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 059966b617f..16d85991010 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -109,6 +109,7 @@ 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;
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
125static struct kobj_type device_ktype = { 127static struct kobj_type device_ktype = {
@@ -859,6 +861,13 @@ int device_add(struct device *dev)
859 if (!dev) 861 if (!dev)
860 goto done; 862 goto done;
861 863
864 dev->p = kzalloc(sizeof(*dev->p), GFP_KERNEL);
865 if (!dev->p) {
866 error = -ENOMEM;
867 goto done;
868 }
869 dev->p->device = dev;
870
862 /* 871 /*
863 * for statically allocated devices, which should all be converted 872 * for statically allocated devices, which should all be converted
864 * some day, we need to initialize the name. We prevent reading back 873 * some day, we need to initialize the name. We prevent reading back