Commit 926beadb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "driver core: create a private portion of struct device"

This reverts commit 2831fe6f.

Turns out that device_initialize shouldn't fail silently.
This series needs to be reworked in order to get into proper
shape.
Reported-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e2d40776
...@@ -63,18 +63,6 @@ struct class_private { ...@@ -63,18 +63,6 @@ struct class_private {
#define to_class(obj) \ #define to_class(obj) \
container_of(obj, struct class_private, class_subsys.kobj) container_of(obj, struct class_private, class_subsys.kobj)
/**
* struct device_private - structure to hold the private to the driver core portions of the device structure.
*
* @device - pointer back to the struct class that this structure is
* associated with.
*
* Nothing outside of the driver core should ever touch these fields.
*/
struct device_private {
struct device *device;
};
/* initialisation functions */ /* initialisation functions */
extern int devices_init(void); extern int devices_init(void);
extern int buses_init(void); extern int buses_init(void);
......
...@@ -109,7 +109,6 @@ static struct sysfs_ops dev_sysfs_ops = { ...@@ -109,7 +109,6 @@ static struct sysfs_ops dev_sysfs_ops = {
static void device_release(struct kobject *kobj) static void device_release(struct kobject *kobj)
{ {
struct device *dev = to_dev(kobj); struct device *dev = to_dev(kobj);
struct device_private *p = dev->p;
if (dev->release) if (dev->release)
dev->release(dev); dev->release(dev);
...@@ -121,7 +120,6 @@ static void device_release(struct kobject *kobj) ...@@ -121,7 +120,6 @@ static void device_release(struct kobject *kobj)
WARN(1, KERN_ERR "Device '%s' does not have a release() " WARN(1, KERN_ERR "Device '%s' does not have a release() "
"function, it is broken and must be fixed.\n", "function, it is broken and must be fixed.\n",
dev_name(dev)); dev_name(dev));
kfree(p);
} }
static struct kobj_type device_ktype = { static struct kobj_type device_ktype = {
...@@ -538,12 +536,6 @@ static void klist_children_put(struct klist_node *n) ...@@ -538,12 +536,6 @@ static void klist_children_put(struct klist_node *n)
*/ */
void device_initialize(struct device *dev) void device_initialize(struct device *dev)
{ {
dev->p = kzalloc(sizeof(*dev->p), GFP_KERNEL);
if (!dev->p) {
WARN_ON(1);
return;
}
dev->p->device = dev;
dev->kobj.kset = devices_kset; dev->kobj.kset = devices_kset;
kobject_init(&dev->kobj, &device_ktype); kobject_init(&dev->kobj, &device_ktype);
klist_init(&dev->klist_children, klist_children_get, klist_init(&dev->klist_children, klist_children_get,
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#define BUS_ID_SIZE 20 #define BUS_ID_SIZE 20
struct device; struct device;
struct device_private;
struct device_driver; struct device_driver;
struct driver_private; struct driver_private;
struct class; struct class;
...@@ -372,8 +371,6 @@ struct device { ...@@ -372,8 +371,6 @@ struct device {
struct klist_node knode_bus; struct klist_node knode_bus;
struct device *parent; struct device *parent;
struct device_private *p;
struct kobject kobj; struct kobject kobj;
char bus_id[BUS_ID_SIZE]; /* position on parent bus */ char bus_id[BUS_ID_SIZE]; /* position on parent bus */
unsigned uevent_suppress:1; unsigned uevent_suppress:1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment