leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

driver core: create a private portion of struct device

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman 2008-12-16 12:23:36 -08:00
parent 2e5ba26a48
commit 2831fe6f9c
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/base/base.h
View File

@ -63,6 +63,18 @@ 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);

8
drivers/base/core.c
View File

@ -109,6 +109,7 @@ 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);
@ -120,6 +121,7 @@ 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 = {
@ -536,6 +538,12 @@ 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,

3
include/linux/device.h
View File

@ -28,6 +28,7 @@
#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;
@ -371,6 +372,8 @@ 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;