diff options
author | 2017-09-05 11:08:13 +0200 | |
---|---|---|
committer | 2017-09-05 11:08:13 +0200 | |
commit | aaf4f13c456f5fb513d907ede137e8ba77d6adfb (patch) | |
tree | 70e421730e99263d7e83904f7112a47bbc2667a3 /drivers/hid | |
parent | Merge branch 'for-4.14/battery' into for-linus (diff) | |
parent | HID: ntrig: constify attribute_group structures. (diff) | |
download | linux-aaf4f13c456f5fb513d907ede137e8ba77d6adfb.tar.gz linux-aaf4f13c456f5fb513d907ede137e8ba77d6adfb.tar.bz2 linux-aaf4f13c456f5fb513d907ede137e8ba77d6adfb.zip |
Merge branch 'for-4.14/constify-attribute_group' into for-linus
- struct attribute_group constification from Arvind Yadav
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 2 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 2 | ||||
-rw-r--r-- | drivers/hid/hid-ntrig.c | 2 | ||||
-rw-r--r-- | drivers/hid/hid-sensor-custom.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 501e16a9227d..614054af904a 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -2926,7 +2926,7 @@ static struct attribute *sysfs_attrs[] = { NULL }; -static struct attribute_group ps_attribute_group = { +static const struct attribute_group ps_attribute_group = { .attrs = sysfs_attrs }; diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index aff20f4b6d97..e8acf93e6597 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -341,7 +341,7 @@ static struct attribute *sysfs_attrs[] = { NULL }; -static struct attribute_group mt_attribute_group = { +static const struct attribute_group mt_attribute_group = { .attrs = sysfs_attrs }; diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 1b0084d4af2e..3d121d8ee980 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -445,7 +445,7 @@ static struct attribute *sysfs_attrs[] = { NULL }; -static struct attribute_group ntrig_attribute_group = { +static const struct attribute_group ntrig_attribute_group = { .attrs = sysfs_attrs }; diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c index 3a84aaf1418b..fb86f86b9d92 100644 --- a/drivers/hid/hid-sensor-custom.c +++ b/drivers/hid/hid-sensor-custom.c @@ -276,7 +276,7 @@ static struct attribute *enable_sensor_attrs[] = { NULL, }; -static struct attribute_group enable_sensor_attr_group = { +static const struct attribute_group enable_sensor_attr_group = { .attrs = enable_sensor_attrs, }; |