diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2009-06-24 13:06:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:50:47 -0400 |
commit | a4dbd6740df0872cdf0a86841f75beec8381964d (patch) | |
tree | 1093687845d89f8397d61e7df1ad8546a5a25225 /include | |
parent | 5b2ea2f10dbb2fa91d8033993000f8664309395f (diff) |
driver model: constify attribute groups
Let attribute group vectors be declared "const". We'd
like to let most attribute metadata live in read-only
sections... this is a start.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/attribute_container.h | 2 | ||||
-rw-r--r-- | include/linux/device.h | 6 | ||||
-rw-r--r-- | include/linux/netdevice.h | 2 | ||||
-rw-r--r-- | include/linux/transport_class.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/attribute_container.h b/include/linux/attribute_container.h index 794ad74b1d61..c3ab81428c66 100644 --- a/include/linux/attribute_container.h +++ b/include/linux/attribute_container.h | |||
@@ -17,7 +17,7 @@ struct attribute_container { | |||
17 | struct list_head node; | 17 | struct list_head node; |
18 | struct klist containers; | 18 | struct klist containers; |
19 | struct class *class; | 19 | struct class *class; |
20 | struct attribute_group *grp; | 20 | const struct attribute_group *grp; |
21 | struct device_attribute **attrs; | 21 | struct device_attribute **attrs; |
22 | int (*match)(struct attribute_container *, struct device *); | 22 | int (*match)(struct attribute_container *, struct device *); |
23 | #define ATTRIBUTE_CONTAINER_NO_CLASSDEVS 0x01 | 23 | #define ATTRIBUTE_CONTAINER_NO_CLASSDEVS 0x01 |
diff --git a/include/linux/device.h b/include/linux/device.h index 3f33f17f556c..e19e40a3dcbe 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -131,7 +131,7 @@ struct device_driver { | |||
131 | void (*shutdown) (struct device *dev); | 131 | void (*shutdown) (struct device *dev); |
132 | int (*suspend) (struct device *dev, pm_message_t state); | 132 | int (*suspend) (struct device *dev, pm_message_t state); |
133 | int (*resume) (struct device *dev); | 133 | int (*resume) (struct device *dev); |
134 | struct attribute_group **groups; | 134 | const struct attribute_group **groups; |
135 | 135 | ||
136 | const struct dev_pm_ops *pm; | 136 | const struct dev_pm_ops *pm; |
137 | 137 | ||
@@ -288,7 +288,7 @@ extern void class_destroy(struct class *cls); | |||
288 | */ | 288 | */ |
289 | struct device_type { | 289 | struct device_type { |
290 | const char *name; | 290 | const char *name; |
291 | struct attribute_group **groups; | 291 | const struct attribute_group **groups; |
292 | int (*uevent)(struct device *dev, struct kobj_uevent_env *env); | 292 | int (*uevent)(struct device *dev, struct kobj_uevent_env *env); |
293 | char *(*nodename)(struct device *dev); | 293 | char *(*nodename)(struct device *dev); |
294 | void (*release)(struct device *dev); | 294 | void (*release)(struct device *dev); |
@@ -412,7 +412,7 @@ struct device { | |||
412 | 412 | ||
413 | struct klist_node knode_class; | 413 | struct klist_node knode_class; |
414 | struct class *class; | 414 | struct class *class; |
415 | struct attribute_group **groups; /* optional groups */ | 415 | const struct attribute_group **groups; /* optional groups */ |
416 | 416 | ||
417 | void (*release)(struct device *dev); | 417 | void (*release)(struct device *dev); |
418 | }; | 418 | }; |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 65ee1929b2b1..a9aa4b5917d7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -895,7 +895,7 @@ struct net_device | |||
895 | /* class/net/name entry */ | 895 | /* class/net/name entry */ |
896 | struct device dev; | 896 | struct device dev; |
897 | /* space for optional statistics and wireless sysfs groups */ | 897 | /* space for optional statistics and wireless sysfs groups */ |
898 | struct attribute_group *sysfs_groups[3]; | 898 | const struct attribute_group *sysfs_groups[3]; |
899 | 899 | ||
900 | /* rtnetlink link ops */ | 900 | /* rtnetlink link ops */ |
901 | const struct rtnl_link_ops *rtnl_link_ops; | 901 | const struct rtnl_link_ops *rtnl_link_ops; |
diff --git a/include/linux/transport_class.h b/include/linux/transport_class.h index eaec1ea9558e..9ae8da3e6407 100644 --- a/include/linux/transport_class.h +++ b/include/linux/transport_class.h | |||
@@ -55,7 +55,7 @@ struct anon_transport_class cls = { \ | |||
55 | 55 | ||
56 | struct transport_container { | 56 | struct transport_container { |
57 | struct attribute_container ac; | 57 | struct attribute_container ac; |
58 | struct attribute_group *statistics; | 58 | const struct attribute_group *statistics; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | #define attribute_container_to_transport_container(x) \ | 61 | #define attribute_container_to_transport_container(x) \ |