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 /drivers/usb | |
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 'drivers/usb')
-rw-r--r-- | drivers/usb/core/endpoint.c | 2 | ||||
-rw-r--r-- | drivers/usb/core/sysfs.c | 4 | ||||
-rw-r--r-- | drivers/usb/core/usb.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c index bc39fc40bbde..fdfaa7885515 100644 --- a/drivers/usb/core/endpoint.c +++ b/drivers/usb/core/endpoint.c | |||
@@ -154,7 +154,7 @@ static struct attribute *ep_dev_attrs[] = { | |||
154 | static struct attribute_group ep_dev_attr_grp = { | 154 | static struct attribute_group ep_dev_attr_grp = { |
155 | .attrs = ep_dev_attrs, | 155 | .attrs = ep_dev_attrs, |
156 | }; | 156 | }; |
157 | static struct attribute_group *ep_dev_groups[] = { | 157 | static const struct attribute_group *ep_dev_groups[] = { |
158 | &ep_dev_attr_grp, | 158 | &ep_dev_attr_grp, |
159 | NULL | 159 | NULL |
160 | }; | 160 | }; |
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index b5c72e458943..7ec3041ae79e 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c | |||
@@ -573,7 +573,7 @@ static struct attribute_group dev_string_attr_grp = { | |||
573 | .is_visible = dev_string_attrs_are_visible, | 573 | .is_visible = dev_string_attrs_are_visible, |
574 | }; | 574 | }; |
575 | 575 | ||
576 | struct attribute_group *usb_device_groups[] = { | 576 | const struct attribute_group *usb_device_groups[] = { |
577 | &dev_attr_grp, | 577 | &dev_attr_grp, |
578 | &dev_string_attr_grp, | 578 | &dev_string_attr_grp, |
579 | NULL | 579 | NULL |
@@ -799,7 +799,7 @@ static struct attribute_group intf_assoc_attr_grp = { | |||
799 | .is_visible = intf_assoc_attrs_are_visible, | 799 | .is_visible = intf_assoc_attrs_are_visible, |
800 | }; | 800 | }; |
801 | 801 | ||
802 | struct attribute_group *usb_interface_groups[] = { | 802 | const struct attribute_group *usb_interface_groups[] = { |
803 | &intf_attr_grp, | 803 | &intf_attr_grp, |
804 | &intf_assoc_attr_grp, | 804 | &intf_assoc_attr_grp, |
805 | NULL | 805 | NULL |
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index e2a8cfaade1d..c0e0ae2bb8e7 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h | |||
@@ -152,8 +152,8 @@ static inline int is_active(const struct usb_interface *f) | |||
152 | extern const char *usbcore_name; | 152 | extern const char *usbcore_name; |
153 | 153 | ||
154 | /* sysfs stuff */ | 154 | /* sysfs stuff */ |
155 | extern struct attribute_group *usb_device_groups[]; | 155 | extern const struct attribute_group *usb_device_groups[]; |
156 | extern struct attribute_group *usb_interface_groups[]; | 156 | extern const struct attribute_group *usb_interface_groups[]; |
157 | 157 | ||
158 | /* usbfs stuff */ | 158 | /* usbfs stuff */ |
159 | extern struct mutex usbfs_mutex; | 159 | extern struct mutex usbfs_mutex; |