aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/base.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-28 12:28:39 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-22 00:54:52 -0400
commit1fbfee6c6dc0f4a4c587b6b163ee79643fc9aaa7 (patch)
tree897a68a94e12a9ba92b090f9da5a27086d29b8da /drivers/base/base.h
parent184f1f779d5a2e62de4a0b34842ddf8546beca8f (diff)
class: rename "subsys" to "class_subsys" in internal class structure
This renames the struct class "subsys" field to be "class_subsys" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/base.h')
-rw-r--r--drivers/base/base.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h
index 670b95a1a510..a77d4bd2ea63 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -40,7 +40,7 @@ struct driver_private {
40/** 40/**
41 * struct class_private - structure to hold the private to the driver core portions of the class structure. 41 * struct class_private - structure to hold the private to the driver core portions of the class structure.
42 * 42 *
43 * @subsys - the struct kset that defines this class. This is the main kobject 43 * @class_subsys - the struct kset that defines this class. This is the main kobject
44 * @children - list of class_devices associated with this class 44 * @children - list of class_devices associated with this class
45 * @class_devices - list of devices associated with this class 45 * @class_devices - list of devices associated with this class
46 * @class_interfaces - list of class_interfaces associated with this class 46 * @class_interfaces - list of class_interfaces associated with this class
@@ -54,14 +54,15 @@ struct driver_private {
54 * core should ever touch these fields. 54 * core should ever touch these fields.
55 */ 55 */
56struct class_private { 56struct class_private {
57 struct kset subsys; 57 struct kset class_subsys;
58 struct list_head class_devices; 58 struct list_head class_devices;
59 struct list_head class_interfaces; 59 struct list_head class_interfaces;
60 struct kset class_dirs; 60 struct kset class_dirs;
61 struct semaphore sem; 61 struct semaphore sem;
62 struct class *class; 62 struct class *class;
63}; 63};
64#define to_class(obj) container_of(obj, struct class_private, subsys.kobj) 64#define to_class(obj) \
65 container_of(obj, struct class_private, class_subsys.kobj)
65 66
66/* initialisation functions */ 67/* initialisation functions */
67extern int devices_init(void); 68extern int devices_init(void);